svelteesp32 1.9.1 → 1.9.3

package/README.md

@@ -18,7 +18,7 @@ This npm package provides a solution for **inserting any JS client application i
 
 > Starting with version v1.7.0, with the cachetime command line option, you can set whether the browser can cache pages
 
-> Starting with version v1.6.0, mime npm package is used instead of mime-types (application/javascript -> text/javascript)
+> Starting with version v1.6.0, mime-types package properly handles MIME types (application/javascript -> text/javascript)
 
 > Starting with version v1.5.0, PsychicHttp v2 is also supported.
 
@@ -30,6 +30,11 @@ This npm package provides a solution for **inserting any JS client application i
 
 > Starting with version v1.1.0, the ETag header is also supported.
 
+### Requirements
+
+- Node.js >= 20
+- npm >= 9
+
 ### Usage
 
 **Install package** as devDependency (it is practical if the package is part of the project so that you always receive updates)
@@ -54,19 +59,25 @@ npx svelteesp32 -e async -s ../svelteapp/dist -o ../esp32project/svelteesp32.h -
 npx svelteesp32 -e espidf -s ../svelteapp/dist -o ../esp32project/svelteesp32.h --etag=true
 ```
 
-During the **translation process**, the processed file details are visible, and at the end, the result shows the ESP's memory allocation (gzip size)
+During the **translation process**, the processed file details are visible with compression ratios, and at the end, the result shows the ESP's memory allocation (gzip size)
 
 ```
-[assets/index-KwubEIf-.js]  ✓ gzip used (38850 -> 12547)
-[assets/index-Soe6cpLA.css] ✓ gzip used (32494 -> 5368)
-[favicon.png]               x gzip unused (33249 -> 33282)
-[index.html]                x gzip unused (too small) (472 -> 308)
-[roboto_regular.json]       ✓ gzip used (363757 -> 93567)
+[assets/index-KwubEIf-.js]  ✓ gzip used (38850 -> 12547 = 32%)
+[assets/index-Soe6cpLA.css] ✓ gzip used (32494 -> 5368 = 17%)
+[favicon.png]               x gzip unused (33249 -> 33282 = 100%)
+[index.html]                x gzip unused (too small) (472 -> 308 = 65%)
+[roboto_regular.json]       ✓ gzip used (363757 -> 93567 = 26%)
 
 5 files, 458kB original size, 142kB gzip size
 ../../../Arduino/EspSvelte/svelteesp32.h 842kB size
 ```
 
+The tool automatically:
+
+- Compresses files with gzip level 9 when beneficial (>1024 bytes and >15% reduction)
+- Detects and reports duplicate files using SHA256 hashing
+- Skips pre-compressed files (.gz, .br, .brottli) if the original exists
+
 **Include svelteesp32.h** into your Arduino or PlatformIO c++ project (copy it next to the main c++ file)
 
 ```c
@@ -111,59 +122,107 @@ void setup()
 }
 ```
 
-You can find a minimal buildable example platformio project in [demo/esp32](demo/esp32) folder.
+or for ESP-IDF native:
+
+```c
+...
+
+#include <esp_http_server.h>
+#include "svelteesp32.h"
+
+httpd_handle_t server = NULL;
+
+...
+
+void app_main()
+{
+    ...
+
+    httpd_config_t config = HTTPD_DEFAULT_CONFIG();
+    httpd_start(&server, &config);
+
+    initSvelteStaticFiles(server);
+}
+```
+
+You can find minimal buildable example projects in [demo/esp32](demo/esp32) (Arduino/PlatformIO) and [demo/esp32idf](demo/esp32idf) (ESP-IDF native) folders.
 
-The content of **generated file** (do not edit, just use)
+The content of **generated file** (do not edit, just use):
 
 ```c
+//engine:   PsychicHttpServer
+//cmdline:  -e psychic -s ./dist -o ./output.h --etag=true --gzip=true
+//
 #define SVELTEESP32_COUNT 5
-#define SVELTEESP32_SIZE 145633
+#define SVELTEESP32_SIZE 468822
+#define SVELTEESP32_SIZE_GZIP 145633
 #define SVELTEESP32_FILE_INDEX_HTML
 #define SVELTEESP32_HTML_FILES 1
+#define SVELTEESP32_CSS_FILES 1
+#define SVELTEESP32_JS_FILES 1
 ...
 
-const uint8_t data0[12547] = {0x1f, 0x8b, 0x8, 0x0, ...
-const uint8_t data1[5368] = {0x1f, 0x8b, 0x8, 0x0, 0x0, ...
-const char * etag0 = "387b88e345cc56ef9091...";
+#include <Arduino.h>
+#include <PsychicHttp.h>
+#include <PsychicHttpsServer.h>
+
+const uint8_t datagzip_assets_index_KwubEIf__js[12547] = {0x1f, 0x8b, 0x8, 0x0, ...
+const uint8_t datagzip_assets_index_Soe6cpLA_css[5368] = {0x1f, 0x8b, 0x8, 0x0, 0x0, ...
+const char * etag_assets_index_KwubEIf__js = "387b88e345cc56ef9091...";
+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") && ...) {
+  server->on("/assets/index-KwubEIf-.js", HTTP_GET, [](PsychicRequest * request) {
+    if (request->hasHeader("If-None-Match") &&
+        request->header("If-None-Match").equals(etag_assets_index_KwubEIf__js)) {
       PsychicResponse response304(request);
       response304.setCode(304);
       return response304.send();
     }
 
     PsychicResponse response(request);
-    response.setContentType("application/javascript");
+    response.setContentType("text/javascript");
     response.addHeader("Content-Encoding", "gzip");
-    response.setContent(data0, sizeof(data0));
+    response.addHeader("Cache-Control", "no-cache");
+    response.addHeader("ETag", etag_assets_index_KwubEIf__js);
+    response.setContent(datagzip_assets_index_KwubEIf__js, 12547);
     return response.send();
   });
 
-  server->on("/assets/index-Soe6cpLA.css", HTTP_GET, [](PsychicRequest * request)
-  {
-    if (request->hasHeader("If-None-Match") && ...) {
-      ...
+  server->on("/assets/index-Soe6cpLA.css", HTTP_GET, [](PsychicRequest * request) {
+    if (request->hasHeader("If-None-Match") &&
+        request->header("If-None-Match").equals(etag_assets_index_Soe6cpLA_css)) {
+      PsychicResponse response304(request);
+      response304.setCode(304);
+      return response304.send();
     }
 
     PsychicResponse response(request);
     response.setContentType("text/css");
     response.addHeader("Content-Encoding", "gzip");
-    response.setContent(data1, sizeof(data1));
+    response.addHeader("Cache-Control", "no-cache");
+    response.addHeader("ETag", etag_assets_index_Soe6cpLA_css);
+    response.setContent(datagzip_assets_index_Soe6cpLA_css, 5368);
     return response.send();
   });
 
-    ...
+  // ... more routes
 }
 ```
 
 ### Engines and ESP variants
 
-ESPAsyncWebServer (current location https://github.com/ESP32Async/ESPAsyncWebServer) is a popular web server. When you want to generate a file for this, use the `-e async` switch.
+Four web server engines are supported:
 
-If you **only work on ESP32**, I recommend using PsychicHttpServer, which uses the native mode ESP-IDF web server inside. This way, its operation is significantly faster and more continuous. You can access this mode with the `-e psychic` switch.
+- **`-e psychic`** (default): PsychicHttpServer V1 - Fast ESP32-only server using ESP-IDF internally. Recommended for ESP32 projects.
+- **`-e psychic2`**: PsychicHttpServer V2 - Updated version with improved API
+- **`-e async`**: ESPAsyncWebServer (https://github.com/ESP32Async/ESPAsyncWebServer) - Popular async server supporting both ESP32 and ESP8266/ESP8285
+- **`-e espidf`**: Native ESP-IDF web server - For projects using ESP-IDF framework directly (not Arduino)
+
+If you **only work on ESP32**, we recommend using PsychicHttpServer (`-e psychic` or `-e psychic2`), which uses the native ESP-IDF web server internally for significantly faster and more stable operation.
+
+**Note for PsychicHttpServer users:** The generated header includes a comment suggesting to configure `server.config.max_uri_handlers` to match or exceed your file count to ensure all routes are properly registered.
 
 ### Gzip
 
@@ -183,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
@@ -239,19 +300,19 @@ You can use the following c++ directives at the project level if you want to con
 
 ### Command line options
 
-| Option        | Description                                                               | default                 |
-| ------------- | ------------------------------------------------------------------------- | ----------------------- |
-| `-s`          | **Source dist folder contains compiled web files**                        |                         |
-| `-e`          | The engine for which the include file is created (psychic/psychic2/async) | psychic                 |
-| `-o`          | Generated output file with path                                           | `svelteesp32.h`         |
-| `--etag`      | Use ETag header for cache (true/false/compiler)                           | false                   |
-| `--cachetime` | Override no-cache response with a max-age=<cachetime> response            | 0                       |
-| `--gzip`      | Compress content with gzip (true/false/compiler)                          | true                    |
-| `--created`   | Include creation time                                                     | false                   |
-| `--version`   | Include a version string, `--version=v$npm_package_version`               | ''                      |
-| `--espmethod` | Name of generated method                                                  | `initSvelteStaticFiles` |
-| `--define`    | Prefix of c++ defines                                                     | `SVELTEESP32`           |
-| `-h`          | Show help                                                                 |                         |
+| Option        | Description                                                                          | default                 |
+| ------------- | ------------------------------------------------------------------------------------ | ----------------------- |
+| `-s`          | **Source dist folder contains compiled web files**                                   | (required)              |
+| `-e`          | The engine for which the include file is created (psychic/psychic2/async/espidf)     | psychic                 |
+| `-o`          | Generated output file with path                                                      | `svelteesp32.h`         |
+| `--etag`      | Use ETag header for cache (true/false/compiler)                                      | false                   |
+| `--cachetime` | Override no-cache response with a max-age=\<cachetime\> response (seconds)           | 0                       |
+| `--gzip`      | Compress content with gzip (true/false/compiler)                                     | true                    |
+| `--created`   | Include creation time in generated header                                            | false                   |
+| `--version`   | Include a version string in generated header, e.g. `--version=v$npm_package_version` | ''                      |
+| `--espmethod` | Name of generated initialization method                                              | `initSvelteStaticFiles` |
+| `--define`    | Prefix of c++ defines (e.g., SVELTEESP32_COUNT)                                      | `SVELTEESP32`           |
+| `-h`          | Show help                                                                            |                         |
 
 ### Q&A
 
@@ -259,9 +320,9 @@ You can use the following c++ directives at the project level if you want to con
 
 - **How fast is cpp file compilation?** The cpp (.h) file can be large, but it can be compiled in a few seconds on any machine. If you don't modify your svelte/react app, it will use the already compiled cpp file (not recompile). This does not increase the speed of ESP32/ESP8266 development.
 
-- **Does the solution use PROGMEM?** No and yes. ESP32 no longer has PROGMEM. (Exists, but does not affect the translation). Instead, if we use a const array in the global namespace, its content will be placed in the code area, i.e. it will not be used from the heap or the stack, so the content of the files to be served will be placed next to the code. When working on ESP8266, PROGMEM will actually be used.
+- **Does the solution use PROGMEM?** It depends on the engine. For PsychicHttpServer (`psychic`, `psychic2`) and ESP-IDF (`espidf`) engines, const arrays are used which are automatically placed in program memory on ESP32. For ESPAsyncWebServer (`async`), PROGMEM directive is explicitly used to support ESP8266/ESP8285. In both cases, the file data is stored in flash memory, not RAM, so your heap and stack remain available for your application.
 
-- **Why is the .h file so big?** The source files are always larger than the binary compiled from them. Does the size information in the header (SVELTEESP32_SIZE, SVELTEESP32_SIZE_GZIP) show the actual memory allocation.
+- **Why is the .h file so big?** The source files are always larger than the binary compiled from them. The .h file contains byte arrays in text format (comma-separated decimal numbers), which takes more space than the binary data itself. The actual memory allocation is shown in the header file defines (SVELTEESP32_SIZE for uncompressed, SVELTEESP32_SIZE_GZIP for compressed).
 
 - **Is collaboration between groups supported?** Yes, the Frontend team produces the application, the use of svelteesp32 is part of the build process. Then, provided with a version number, the .h file is placed in git, which the ESP team translates into the platformio application.
 

package/dist/cppCode.js

@@ -4,15 +4,7 @@ exports.getCppCode = void 0;
 const handlebars_1 = require("handlebars");
 const commandLine_1 = require("./commandLine");
 const cppCodeEspIdf_1 = require("./cppCodeEspIdf");
-const psychicTemplate = `
-//engine:   PsychicHttpServer
-//cmdline:  {{{commandLine}}}
-//You should use server.config.max_uri_handlers = {{fileCount}}; or higher value to proper handles all files
-{{#if created }}
-//created:  {{now}}
-{{/if}}
-//
-
+const commonHeaderSection = `
 {{#switch etag}}
 {{#case "true"}}
 #ifdef {{definePrefix}}_ENABLE_ETAG
@@ -56,38 +48,36 @@ const psychicTemplate = `
 {{#each filesByExtension}}
 #define {{../definePrefix}}_{{this.extension}}_FILES {{this.count}}
 {{/each}}
-
-//
-#include <Arduino.h>
-#include <PsychicHttp.h>
-#include <PsychicHttpsServer.h>
-
-//
+`;
+const dataArraysSection = (progmem = false) => {
+    const memDirective = progmem ? ' PROGMEM' : '';
+    return `
 {{#switch gzip}}
 {{#case "true"}}
   {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
+const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}]${memDirective} = { {{this.bytesGzip}} };
   {{/each}}
 {{/case}}
 {{#case "false"}}
   {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
+const uint8_t data_{{this.dataname}}[{{this.length}}]${memDirective} = { {{this.bytes}} };
   {{/each}}
 {{/case}}
 {{#case "compiler"}}
 #ifdef {{definePrefix}}_ENABLE_GZIP
   {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
+const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}]${memDirective} = { {{this.bytesGzip}} };
   {{/each}}
 #else
   {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
+const uint8_t data_{{this.dataname}}[{{this.length}}]${memDirective} = { {{this.bytes}} };
   {{/each}}
-#endif 
+#endif
 {{/case}}
 {{/switch}}
-
-//
+`;
+};
+const etagArraysSection = `
 {{#switch etag}}
 {{#case "true"}}
   {{#each sources}}
@@ -101,9 +91,30 @@ const char * etag_{{this.dataname}} = "{{this.md5}}";
   {{#each sources}}
 const char * etag_{{this.dataname}} = "{{this.md5}}";
   {{/each}}
-#endif 
+#endif
 {{/case}}
 {{/switch}}
+`;
+const psychicTemplate = `
+//engine:   PsychicHttpServer
+//cmdline:  {{{commandLine}}}
+//You should use server.config.max_uri_handlers = {{fileCount}}; or higher value to proper handles all files
+{{#if created }}
+//created:  {{now}}
+{{/if}}
+//
+${commonHeaderSection}
+
+//
+#include <Arduino.h>
+#include <PsychicHttp.h>
+#include <PsychicHttpsServer.h>
+
+//
+${dataArraysSection(false)}
+
+//
+${etagArraysSection}
 
 //
 // Http Handlers
@@ -115,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();
@@ -123,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}}
 
@@ -201,50 +212,7 @@ const psychic2Template = `
 //created:  {{now}}
 {{/if}}
 //
-
-{{#switch etag}}
-{{#case "true"}}
-#ifdef {{definePrefix}}_ENABLE_ETAG
-#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched ON
-#endif
-{{/case}}
-{{#case "false"}}
-#ifdef {{definePrefix}}_ENABLE_ETAG
-#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched OFF
-#endif
-{{/case}}
-{{/switch}}
-
-{{#switch gzip}}
-{{#case "true"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched ON
-#endif
-{{/case}}
-{{#case "false"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched OFF
-#endif
-{{/case}}
-{{/switch}}
-
-//
-{{#if version }}
-#define {{definePrefix}}_VERSION "{{version}}"
-{{/if}}
-#define {{definePrefix}}_COUNT {{fileCount}}
-#define {{definePrefix}}_SIZE {{fileSize}}
-#define {{definePrefix}}_SIZE_GZIP {{fileGzipSize}}
-
-//
-{{#each sources}}
-#define {{../definePrefix}}_FILE_{{this.datanameUpperCase}}
-{{/each}}
-
-//
-{{#each filesByExtension}}
-#define {{../definePrefix}}_{{this.extension}}_FILES {{this.count}}
-{{/each}}
+${commonHeaderSection}
 
 //
 #include <Arduino.h>
@@ -252,47 +220,10 @@ const psychic2Template = `
 #include <PsychicHttpsServer.h>
 
 //
-{{#switch gzip}}
-{{#case "true"}}
-  {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
-  {{/each}}
-{{/case}}
-{{#case "false"}}
-  {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
-  {{/each}}
-{{/case}}
-{{#case "compiler"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-  {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
-  {{/each}}
-#else
-  {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
-  {{/each}}
-#endif 
-{{/case}}
-{{/switch}}
+${dataArraysSection(false)}
 
 //
-{{#switch etag}}
-{{#case "true"}}
-  {{#each sources}}
-const char * etag_{{this.dataname}} = "{{this.md5}}";
-  {{/each}}
-{{/case}}
-{{#case "false"}}
-{{/case}}
-{{#case "compiler"}}
-#ifdef {{definePrefix}}_ENABLE_ETAG
-  {{#each sources}}
-const char * etag_{{this.dataname}} = "{{this.md5}}";
-  {{/each}}
-#endif 
-{{/case}}
-{{/switch}}
+${etagArraysSection}
 
 //
 // Http Handlers
@@ -304,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}}
 
@@ -387,120 +318,111 @@ const asyncTemplate = `
 //created:  {{now}}
 {{/if}}
 //
+${commonHeaderSection}
 
-{{#switch etag}}
-{{#case "true"}}
-#ifdef {{definePrefix}}_ENABLE_ETAG
-#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched ON
-#endif
-{{/case}}
-{{#case "false"}}
-#ifdef {{definePrefix}}_ENABLE_ETAG
-#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched OFF
-#endif
-{{/case}}
-{{/switch}}
+//
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
 
-{{#switch gzip}}
-{{#case "true"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched ON
-#endif
-{{/case}}
-{{#case "false"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched OFF
-#endif
-{{/case}}
-{{/switch}}
+//
+${dataArraysSection(true)}
 
 //
-{{#if version }}
-#define {{definePrefix}}_VERSION "{{version}}"
-{{/if}}
-#define {{definePrefix}}_COUNT {{fileCount}}
-#define {{definePrefix}}_SIZE {{fileSize}}
-#define {{definePrefix}}_SIZE_GZIP {{fileGzipSize}}
+${etagArraysSection}
 
 //
+// Http Handlers
+void {{methodName}}(AsyncWebServer * server) {
 {{#each sources}}
-#define {{../definePrefix}}_FILE_{{this.datanameUpperCase}}
-{{/each}}
-
 //
-{{#each filesByExtension}}
-#define {{../definePrefix}}_{{this.extension}}_FILES {{this.count}}
-{{/each}}
+// {{this.filename}}
+  server->on("/{{this.filename}}", HTTP_GET, [](AsyncWebServerRequest * request) {
 
-//
-#include <Arduino.h>
-#include <ESPAsyncWebServer.h>
+{{#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}}
+{{#switch ../gzip}}
 {{#case "true"}}
-  {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] PROGMEM = { {{this.bytesGzip}} };
-  {{/each}}
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", datagzip_{{this.dataname}}, {{this.lengthGzip}});
+    {{#if this.isGzip}}
+    response->addHeader("Content-Encoding", "gzip");
+    {{/if}}
 {{/case}}
 {{#case "false"}}
-  {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] PROGMEM = { {{this.bytes}} };
-  {{/each}}
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", data_{{this.dataname}}, {{this.length}});
 {{/case}}
 {{#case "compiler"}}
-#ifdef {{definePrefix}}_ENABLE_GZIP
-  {{#each sources}}
-const uint8_t datagzip_{{this.dataname}}[{{this.lengthGzip}}] PROGMEM = { {{this.bytesGzip}} };
-  {{/each}}
-#else
-  {{#each sources}}
-const uint8_t data_{{this.dataname}}[{{this.length}}] PROGMEM = { {{this.bytes}} };
-  {{/each}}
-#endif 
+  #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}}
+{{#switch ../etag}}
 {{#case "true"}}
-  {{#each sources}}
-const char * etag_{{this.dataname}} = "{{this.md5}}";
-  {{/each}}
-{{/case}}
-{{#case "false"}}
+{{#../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
-  {{#each sources}}
-const char * etag_{{this.dataname}} = "{{this.md5}}";
-  {{/each}}
-#endif 
+  #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}}
 
-//
-// Http Handlers
-void {{methodName}}(AsyncWebServer * server) {
-{{#each sources}}
-//
-// {{this.filename}}
-  ArRequestHandlerFunction func_{{this.dataname}} = [](AsyncWebServerRequest * request) {
+    request->send(response);
+  });
+  {{#if this.isDefault}}
+  server->on("/", 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}}
 
@@ -522,7 +444,7 @@ void {{methodName}}(AsyncWebServer * server) {
     {{/if}}
   #else
     AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", data_{{this.dataname}}, {{this.length}});
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -545,15 +467,12 @@ 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}});
+  });
   {{/if}}
 
 {{/each}}
@@ -570,33 +489,26 @@ const getTemplate = (engine) => {
             return asyncTemplate;
     }
 };
-let switchValue;
-const getCppCode = (sources, filesByExtension) => (0, handlebars_1.compile)(getTemplate(commandLine_1.cmdLine.engine))({
-    commandLine: process.argv.slice(2).join(' '),
-    now: `${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`,
-    fileCount: sources.length.toString(),
-    fileSize: sources.reduce((previous, current) => previous + current.content.length, 0).toString(),
-    fileGzipSize: sources.reduce((previous, current) => previous + current.contentGzip.length, 0).toString(),
-    sources: sources.map((s) => ({
-        ...s,
-        length: s.content.length,
-        bytes: [...s.content].map((v) => `${v.toString(10)}`).join(','),
-        lengthGzip: s.contentGzip.length,
-        bytesGzip: [...s.contentGzip].map((v) => `${v.toString(10)}`).join(','),
-        isDefault: s.filename.startsWith('index.htm')
-    })),
-    filesByExtension,
-    etag: commandLine_1.cmdLine.etag,
-    gzip: commandLine_1.cmdLine.gzip,
-    created: commandLine_1.cmdLine.created,
-    version: commandLine_1.cmdLine.version,
-    methodName: commandLine_1.cmdLine.espmethod,
-    cacheTime: commandLine_1.cmdLine.cachetime ? { value: commandLine_1.cmdLine.cachetime } : undefined,
-    definePrefix: commandLine_1.cmdLine.define
-}, {
-    helpers: {
+const transformSourceToTemplateData = (s) => ({
+    ...s,
+    length: s.content.length,
+    bytes: [...s.content].map((v) => `${v.toString(10)}`).join(','),
+    lengthGzip: s.contentGzip.length,
+    bytesGzip: [...s.contentGzip].map((v) => `${v.toString(10)}`).join(','),
+    isDefault: s.filename.startsWith('index.htm')
+});
+const postProcessCppCode = (code) => code
+    .split('\n')
+    .map((line) => line.trimEnd())
+    .filter(Boolean)
+    .map((line) => (line === '//' ? '' : line))
+    .join('\n')
+    .replace(/\\n{2}/, '\n');
+const createHandlebarsHelpers = () => {
+    let switchValue;
+    return {
         ifeq: function (a, b, options) {
-            if (a == b)
+            if (a === b)
                 return options.fn(this);
             return options.inverse(this);
         },
@@ -605,16 +517,31 @@ const getCppCode = (sources, filesByExtension) => (0, handlebars_1.compile)(getT
             return options.fn(this);
         },
         case: function (value, options) {
-            if (value == switchValue)
+            if (value === switchValue)
                 return options.fn(this);
             return options.inverse(this);
         }
-    }
-})
-    .split('\n')
-    .map((line) => line.trimEnd())
-    .filter(Boolean)
-    .map((line) => (line == '//' ? '' : line))
-    .join('\n')
-    .replace(/\\n{2}/, '\n');
+    };
+};
+const getCppCode = (sources, filesByExtension) => {
+    const template = (0, handlebars_1.compile)(getTemplate(commandLine_1.cmdLine.engine));
+    const templateData = {
+        commandLine: process.argv.slice(2).join(' '),
+        now: `${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`,
+        fileCount: sources.length.toString(),
+        fileSize: sources.reduce((previous, current) => previous + current.content.length, 0).toString(),
+        fileGzipSize: sources.reduce((previous, current) => previous + current.contentGzip.length, 0).toString(),
+        sources: sources.map((s) => transformSourceToTemplateData(s)),
+        filesByExtension,
+        etag: commandLine_1.cmdLine.etag,
+        gzip: commandLine_1.cmdLine.gzip,
+        created: commandLine_1.cmdLine.created,
+        version: commandLine_1.cmdLine.version,
+        methodName: commandLine_1.cmdLine.espmethod,
+        cacheTime: commandLine_1.cmdLine.cachetime ? { value: commandLine_1.cmdLine.cachetime } : undefined,
+        definePrefix: commandLine_1.cmdLine.define
+    };
+    const rawCode = template(templateData, { helpers: createHandlebarsHelpers() });
+    return postProcessCppCode(rawCode);
+};
 exports.getCppCode = getCppCode;

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/dist/file.js

@@ -14,35 +14,46 @@ const findSimilarFiles = (files) => {
     const contentComparer = new Map();
     for (const [filename, content] of files.entries()) {
         const hash = (0, node_crypto_1.createHash)('sha256').update(content).digest('hex');
-        if (contentComparer.has(hash))
-            contentComparer.get(hash).push(filename);
-        else
+        const existingFiles = contentComparer.get(hash);
+        if (existingFiles) {
+            existingFiles.push(filename);
+        }
+        else {
             contentComparer.set(hash, [filename]);
+        }
     }
     const result = [];
-    for (const filenames of contentComparer.values())
-        if (filenames.length > 1)
+    for (const filenames of contentComparer.values()) {
+        if (filenames.length > 1) {
             result.push(filenames);
+        }
+    }
     return result;
 };
-const getFiles = () => {
-    let filenames = (0, glob_1.globSync)('**/*', { cwd: commandLine_1.cmdLine.sourcepath, nodir: true });
-    filenames = filenames.filter((filename) => {
-        const extension = node_path_1.default.extname(filename);
-        if (['.gz', '.brottli', '.br'].includes(extension)) {
-            const original = filename.slice(0, -1 * extension.length);
-            if (filenames.includes(original)) {
-                console.log((0, consoleColor_1.redLog)(` ${filename} skipped because is perhaps a compressed version of ${original}`));
-                return false;
-            }
+const shouldSkipFile = (filename, allFilenames) => {
+    const extension = node_path_1.default.extname(filename);
+    const compressedExtensions = ['.gz', '.brottli', '.br'];
+    if (compressedExtensions.includes(extension)) {
+        const original = filename.slice(0, -1 * extension.length);
+        if (allFilenames.includes(original)) {
+            console.log((0, consoleColor_1.redLog)(` ${filename} skipped because is perhaps a compressed version of ${original}`));
+            return true;
         }
-        return true;
-    });
+    }
+    return false;
+};
+const getFiles = () => {
+    const allFilenames = (0, glob_1.globSync)('**/*', { cwd: commandLine_1.cmdLine.sourcepath, nodir: true });
+    const filenames = allFilenames.filter((filename) => !shouldSkipFile(filename, allFilenames));
     const result = new Map();
-    for (const filename of filenames)
-        result.set(filename, (0, node_fs_1.readFileSync)(node_path_1.default.join(commandLine_1.cmdLine.sourcepath, filename), { flag: 'r' }));
-    for (const sameFile of findSimilarFiles(result))
-        console.log((0, consoleColor_1.yellowLog)(` ${sameFile.join(', ')} files look like identical`));
+    for (const filename of filenames) {
+        const filePath = node_path_1.default.join(commandLine_1.cmdLine.sourcepath, filename);
+        result.set(filename, (0, node_fs_1.readFileSync)(filePath, { flag: 'r' }));
+    }
+    const duplicates = findSimilarFiles(result);
+    for (const sameFiles of duplicates) {
+        console.log((0, consoleColor_1.yellowLog)(` ${sameFiles.join(', ')} files look like identical`));
+    }
     return result;
 };
 exports.getFiles = getFiles;

package/dist/index.js

@@ -12,6 +12,8 @@ const commandLine_1 = require("./commandLine");
 const consoleColor_1 = require("./consoleColor");
 const cppCode_1 = require("./cppCode");
 const file_1 = require("./file");
+const GZIP_MIN_SIZE = 1024;
+const GZIP_MIN_REDUCTION_RATIO = 0.85;
 const summary = {
     filecount: 0,
     size: 0,
@@ -19,6 +21,36 @@ const summary = {
 };
 const sources = [];
 const filesByExtension = [];
+const shouldUseGzip = (originalSize, compressedSize) => originalSize > GZIP_MIN_SIZE && compressedSize < originalSize * GZIP_MIN_REDUCTION_RATIO;
+const calculateCompressionRatio = (originalSize, compressedSize) => Math.round((compressedSize / originalSize) * 100);
+const formatCompressionLog = (filename, padding, originalSize, compressedSize, useGzip) => {
+    const ratio = calculateCompressionRatio(originalSize, compressedSize);
+    const sizeInfo = `(${originalSize} -> ${compressedSize} = ${ratio}%)`;
+    if (useGzip) {
+        return (0, consoleColor_1.greenLog)(` [${filename}] ${padding} ✓ gzip used ${sizeInfo}`);
+    }
+    const tooSmall = originalSize <= GZIP_MIN_SIZE ? '(too small) ' : '';
+    return (0, consoleColor_1.yellowLog)(` [${filename}] ${padding} x gzip unused ${tooSmall}${sizeInfo}`);
+};
+const createSourceEntry = (filename, dataname, content, contentGzip, mimeType, md5, isGzip) => ({
+    filename,
+    dataname,
+    datanameUpperCase: dataname.toUpperCase(),
+    content,
+    contentGzip: isGzip ? contentGzip : content,
+    isGzip,
+    mime: mimeType,
+    md5
+});
+const updateExtensionGroup = (extension) => {
+    const group = filesByExtension.find((fe) => fe.extension === extension);
+    if (group) {
+        group.count += 1;
+    }
+    else {
+        filesByExtension.push({ extension, count: 1 });
+    }
+};
 console.log('Collecting source files');
 const files = (0, file_1.getFiles)();
 if (files.size === 0) {
@@ -36,42 +68,15 @@ for (const [originalFilename, content] of files) {
     let extension = node_path_1.default.extname(filename).toUpperCase();
     if (extension.startsWith('.'))
         extension = extension.slice(1);
-    const group = filesByExtension.find((fe) => fe.extension === extension);
-    if (group)
-        group.count += 1;
-    else
-        filesByExtension.push({ extension, count: 1 });
+    updateExtensionGroup(extension);
     const md5 = (0, node_crypto_1.createHash)('md5').update(content).digest('hex');
     summary.size += content.length;
     const zipContent = (0, node_zlib_1.gzipSync)(content, { level: 9 });
     summary.gzipsize += zipContent.length;
-    const zipRatio = Math.round((zipContent.length / content.length) * 100);
-    if (content.length > 1024 && zipContent.length < content.length * 0.85) {
-        sources.push({
-            filename,
-            dataname,
-            datanameUpperCase: dataname.toUpperCase(),
-            content,
-            contentGzip: zipContent,
-            isGzip: true,
-            mime: mimeType,
-            md5
-        });
-        console.log((0, consoleColor_1.greenLog)(` [${originalFilename}] ${' '.repeat(longestFilename - originalFilename.length)} ✓ gzip used (${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
-    }
-    else {
-        sources.push({
-            filename,
-            dataname,
-            datanameUpperCase: dataname.toUpperCase(),
-            content,
-            contentGzip: content,
-            isGzip: false,
-            mime: mimeType,
-            md5
-        });
-        console.log((0, consoleColor_1.yellowLog)(` [${originalFilename}] ${' '.repeat(longestFilename - originalFilename.length)} x gzip unused ${content.length <= 1024 ? `(too small) ` : ''}(${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
-    }
+    const useGzip = shouldUseGzip(content.length, zipContent.length);
+    sources.push(createSourceEntry(filename, dataname, content, zipContent, mimeType, md5, useGzip));
+    const padding = ' '.repeat(longestFilename - originalFilename.length);
+    console.log(formatCompressionLog(originalFilename, padding, content.length, zipContent.length, useGzip));
 }
 console.log('');
 filesByExtension.sort((left, right) => left.extension.localeCompare(right.extension));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -31,14 +31,17 @@
     "dev:async": "nodemon src/index.ts -- -e async -s ./demo/svelte/dist -o ./demo/esp32/include/svelteesp32.h --etag=true --gzip=true --cachetime=86400 --version=v$npm_package_version",
     "dev:psychic": "nodemon src/index.ts -- -e psychic -s ./demo/svelte/dist -o ./demo/esp32/include/svelteesp32.h --etag=false --gzip=false --version=v$npm_package_version",
     "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:all": "./package.script && ~/.platformio/penv/bin/pio run -d ./demo/esp32 && ~/.platformio/penv/bin/pio run -d ./demo/esp32idf",
+    "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": "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": [
@@ -55,18 +58,18 @@
   ],
   "devDependencies": {
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.3.3",
-    "@typescript-eslint/eslint-plugin": "^8.43.0",
-    "@typescript-eslint/parser": "^8.43.0",
-    "eslint": "^9.35.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",
-    "tsx": "^4.20.5",
-    "typescript": "^5.9.2"
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "glob": "^11.0.3",