svelteesp32 2.1.0 → 2.2.0

package/README.md

@@ -79,8 +79,8 @@ void setup() {
 
 ## What's New
 
+- **v2.2.0** — SPA routing catch-all (`--spa`) for client-side routers on all four engines
 - **v2.1.0** — New Arduino WebServer engine (`-e webserver`), dependency updates
-- **v2.0.1** — Dependency updates (ESLint v10, eslint-plugin-unicorn 63), improved error cause chaining
 - **v2.0.0** — **BREAKING**: PsychicHttpServer V2 is now the default `psychic` engine. The `psychic2` engine has been removed. Dry run mode, C++ identifier validation, improved MIME type warnings
 - **v1.16.0** — Size budget constraints (`--maxsize`, `--maxgzipsize`)
 - **v1.15.0** — `--basepath` for multiple frontends (e.g., `/admin`, `/app`)
@@ -376,6 +376,26 @@ void setup() {
 
 **Rules:** Must start with `/`, no trailing slash, no double slashes.
 
+### SPA Routing (Client-Side Routers)
+
+Modern JS frameworks use client-side routing. Without a catch-all, refreshing `/settings` on your ESP32 returns nothing. Add `--spa` to make all unmatched GET requests fall through to `index.html`:
+
+```bash
+npx svelteesp32 -e async -s ./dist -o ./output.h --spa
+npx svelteesp32 -e psychic -s ./dist -o ./output.h --spa --basepath=/app
+```
+
+What gets generated per engine:
+
+| Engine      | Catch-all mechanism                                                                                                          |
+| ----------- | ---------------------------------------------------------------------------------------------------------------------------- |
+| `psychic`   | `server->on("/*", ...)` (no basePath) already handled by `defaultEndpoint`; `server->on("/app/*", ...)` when basePath is set |
+| `async`     | `server->onNotFound(...)` with optional basePath prefix check                                                                |
+| `webserver` | `server->onNotFound(...)` with optional basePath prefix check                                                                |
+| `espidf`    | `httpd_register_err_handler(HTTPD_404_NOT_FOUND, ...)`                                                                       |
+
+**Note:** `--spa` requires `index.html` or `index.htm` in the source directory — a warning is printed if it is missing.
+
 ### C++ Build-Time Validation
 
 Catch configuration issues at compile time with generated defines:
@@ -425,25 +445,26 @@ Called for every response (200 = content served, 304 = cache hit).
 
 ## CLI Reference
 
-| Option           | Description                                        | Default                 |
-| ---------------- | -------------------------------------------------- | ----------------------- |
-| `-s`             | Source folder with compiled web files              | (required)              |
-| `-e`             | Web server engine (psychic/async/espidf/webserver) | `psychic`               |
-| `-o`             | Output header file path                            | `svelteesp32.h`         |
-| `--etag`         | ETag caching (true/false/compiler)                 | `false`                 |
-| `--gzip`         | Gzip compression (true/false/compiler)             | `true`                  |
-| `--exclude`      | Exclude files by glob pattern                      | System files            |
-| `--basepath`     | URL prefix for all routes                          | (none)                  |
-| `--maxsize`      | Max total uncompressed size (e.g., `400k`, `1m`)   | (none)                  |
-| `--maxgzipsize`  | Max total gzip size (e.g., `150k`, `500k`)         | (none)                  |
-| `--cachetime`    | Cache-Control max-age in seconds                   | `0`                     |
-| `--version`      | Version string in header                           | (none)                  |
-| `--define`       | C++ define prefix                                  | `SVELTEESP32`           |
-| `--espmethod`    | Init function name                                 | `initSvelteStaticFiles` |
-| `--config`       | Custom RC file path                                | `.svelteesp32rc.json`   |
-| `--dryrun`       | Show summary without writing output                | `false`                 |
-| `--noindexcheck` | Skip index.html validation                         | `false`                 |
-| `-h`             | Show help                                          |                         |
+| Option           | Description                                         | Default                 |
+| ---------------- | --------------------------------------------------- | ----------------------- |
+| `-s`             | Source folder with compiled web files               | (required)              |
+| `-e`             | Web server engine (psychic/async/espidf/webserver)  | `psychic`               |
+| `-o`             | Output header file path                             | `svelteesp32.h`         |
+| `--etag`         | ETag caching (true/false/compiler)                  | `false`                 |
+| `--gzip`         | Gzip compression (true/false/compiler)              | `true`                  |
+| `--exclude`      | Exclude files by glob pattern                       | System files            |
+| `--basepath`     | URL prefix for all routes                           | (none)                  |
+| `--maxsize`      | Max total uncompressed size (e.g., `400k`, `1m`)    | (none)                  |
+| `--maxgzipsize`  | Max total gzip size (e.g., `150k`, `500k`)          | (none)                  |
+| `--cachetime`    | Cache-Control max-age in seconds                    | `0`                     |
+| `--version`      | Version string in header                            | (none)                  |
+| `--define`       | C++ define prefix                                   | `SVELTEESP32`           |
+| `--espmethod`    | Init function name                                  | `initSvelteStaticFiles` |
+| `--config`       | Custom RC file path                                 | `.svelteesp32rc.json`   |
+| `--dryrun`       | Show summary without writing output                 | `false`                 |
+| `--spa`          | Serve index.html for unmatched routes (SPA routing) | `false`                 |
+| `--noindexcheck` | Skip index.html validation                          | `false`                 |
+| `-h`             | Show help                                           |                         |
 
 ---
 
@@ -463,7 +484,8 @@ Store your settings in `.svelteesp32rc.json` for zero-argument builds:
   "maxsize": "400k",
   "maxgzipsize": "150k",
   "noindexcheck": false,
-  "dryrun": false
+  "dryrun": false,
+  "spa": false
 }
 ```
 

package/dist/commandLine.d.ts

@@ -15,6 +15,7 @@ interface ICopyFilesArguments {
     maxGzipSize?: number;
     noIndexCheck?: boolean;
     dryRun?: boolean;
+    spa?: boolean;
     help?: boolean;
 }
 interface IRcFileConfig {
@@ -34,6 +35,7 @@ interface IRcFileConfig {
     maxgzipsize?: number | string;
     noindexcheck?: boolean;
     dryrun?: boolean;
+    spa?: boolean;
 }
 declare function validateCppIdentifier(value: string, name: string): string;
 declare function parseSize(value: string, name: string): number;

package/dist/commandLine.js

@@ -40,6 +40,7 @@ Options:
   --maxsize <size>           Maximum total uncompressed size (e.g., 400k, 1.5m, 409600)
   --maxgzipsize <size>       Maximum total gzip size (e.g., 150k, 1m, 153600)
   --dryrun                   Show summary without writing the output file (default: false)
+  --spa                      Serve index.html for unmatched routes (SPA routing) (default: false)
   -h, --help                 Shows this help
 
 RC File:
@@ -58,7 +59,8 @@ RC File:
       "basepath": "/ui",
       "maxsize": "400k",
       "maxgzipsize": "150k",
-      "noindexcheck": false
+      "noindexcheck": false,
+      "spa": false
     }
 
   CLI arguments override RC file values.
@@ -268,7 +270,8 @@ function validateRcConfig(config, rcPath) {
         'maxsize',
         'maxgzipsize',
         'noindexcheck',
-        'dryrun'
+        'dryrun',
+        'spa'
     ]);
     for (const key of Object.keys(configObject))
         if (!validKeys.has(key))
@@ -324,6 +327,8 @@ function validateRcConfig(config, rcPath) {
         throw new TypeError(`Invalid noindexcheck in RC file: ${configObject['noindexcheck']} (must be boolean)`);
     if (configObject['dryrun'] !== undefined && typeof configObject['dryrun'] !== 'boolean')
         throw new TypeError(`Invalid dryrun in RC file: ${configObject['dryrun']} (must be boolean)`);
+    if (configObject['spa'] !== undefined && typeof configObject['spa'] !== 'boolean')
+        throw new TypeError(`Invalid spa in RC file: ${configObject['spa']} (must be boolean)`);
     return configObject;
 }
 function parseArguments() {
@@ -389,6 +394,8 @@ function parseArguments() {
         result.noIndexCheck = rcConfig.noindexcheck;
     if (rcConfig.dryrun !== undefined)
         result.dryRun = rcConfig.dryrun;
+    if (rcConfig.spa !== undefined)
+        result.spa = rcConfig.spa;
     if (rcConfig.exclude && rcConfig.exclude.length > 0)
         result.exclude = [...rcConfig.exclude];
     const cliExclude = [];
@@ -475,6 +482,10 @@ function parseArguments() {
             result.dryRun = true;
             continue;
         }
+        if (argument === '--spa') {
+            result.spa = true;
+            continue;
+        }
         if (argument.startsWith('-') && !argument.startsWith('--')) {
             const flag = argument.slice(1);
             const nextArgument = arguments_[index + 1];
@@ -540,6 +551,8 @@ function formatConfiguration(cmdLine) {
         parts.push(`maxSize=${cmdLine.maxSize}`);
     if (cmdLine.maxGzipSize !== undefined)
         parts.push(`maxGzipSize=${cmdLine.maxGzipSize}`);
+    if (cmdLine.spa)
+        parts.push(`spa=${cmdLine.spa}`);
     if (cmdLine.exclude.length > 0)
         parts.push(`exclude=[${cmdLine.exclude.join(', ')}]`);
     return parts.join(' ');

package/dist/cppCode.js

@@ -315,6 +315,94 @@ void {{methodName}}(PsychicHttpServer * server) {
 {{/if}}{{/if}}
 
 {{/each}}
+{{#if spa}}
+{{#with spaSource}}
+{{#if ../basePath}}
+//
+// SPA catch-all: unmatched routes serve {{this.filename}}
+  server->on("{{../basePath}}/*", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {
+
+{{#switch ../etag}}
+{{#case "true"}}
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
+      response->setCode(304);
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      return response->send();
+    }
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
+      response->setCode(304);
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      return response->send();
+    }
+  #endif
+{{/case}}
+{{/switch}}
+
+    response->setContentType("{{this.mime}}");
+
+{{#switch ../gzip}}
+{{#case "true"}}
+{{#if this.isGzip}}
+    response->addHeader("Content-Encoding", "gzip");
+{{/if}}
+{{/case}}
+{{#case "compiler"}}
+  {{#if this.isGzip}}
+  #ifdef {{../definePrefix}}_ENABLE_GZIP
+    response->addHeader("Content-Encoding", "gzip");
+  #endif
+  {{/if}}
+{{/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}}
+
+{{#switch ../gzip}}
+{{#case "true"}}
+    response->setContent(datagzip_{{this.dataname}}, {{this.lengthGzip}});
+{{/case}}
+{{#case "false"}}
+    response->setContent(data_{{this.dataname}}, {{this.length}});
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_GZIP
+    response->setContent(datagzip_{{this.dataname}}, {{this.lengthGzip}});
+  #else
+    response->setContent(data_{{this.dataname}}, {{this.length}});
+  #endif
+{{/case}}
+{{/switch}}
+
+    {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
+    return response->send();
+  });
+{{/if}}
+{{/with}}
+{{/if}}
 }`;
 const asyncTemplate = `
 //engine:   ESPAsyncWebServer
@@ -493,6 +581,87 @@ void {{methodName}}(AsyncWebServer * server) {
   {{/if}}
 
 {{/each}}
+{{#if spa}}
+{{#with spaSource}}
+//
+// SPA catch-all: unmatched routes serve {{this.filename}}
+  server->onNotFound([](AsyncWebServerRequest * request) {
+    if (request->method() != HTTP_GET) { request->send(404); return; }
+{{#if ../basePath}}
+    if (!request->url().startsWith("{{../basePath}}/") && request->url() != "{{../basePath}}") { request->send(404); return; }
+{{/if}}
+
+{{#switch ../etag}}
+{{#case "true"}}
+    const AsyncWebHeader* h = request->getHeader("If-None-Match");
+    if (h && h->value().equals(etag_{{this.dataname}})) {
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      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}})) {
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      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}}
+
+    {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
+    request->send(response);
+  });
+{{/with}}
+{{/if}}
 }`;
 const webserverTemplate = `
 //engine:   Arduino WebServer
@@ -692,6 +861,92 @@ void {{methodName}}(WebServer * server) {
   {{/if}}
 
 {{/each}}
+{{#if spa}}
+{{#with spaSource}}
+//
+// SPA catch-all: unmatched routes serve {{this.filename}}
+  server->onNotFound([server]() {
+    if (server->method() != HTTP_GET) { server->send(404, "text/plain", "Not found"); return; }
+{{#if ../basePath}}
+    if (!server->uri().startsWith("{{../basePath}}/") && server->uri() != "{{../basePath}}") { server->send(404, "text/plain", "Not found"); return; }
+{{/if}}
+
+{{#switch ../etag}}
+{{#case "true"}}
+    if (server->hasHeader("If-None-Match") && server->header("If-None-Match").equals(etag_{{this.dataname}})) {
+      server->send(304);
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      return;
+    }
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+    if (server->hasHeader("If-None-Match") && server->header("If-None-Match").equals(etag_{{this.dataname}})) {
+      server->send(304);
+      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
+      return;
+    }
+  #endif
+{{/case}}
+{{/switch}}
+
+{{#switch ../etag}}
+{{#case "true"}}
+{{#../cacheTime}}
+    server->sendHeader("Cache-Control", "max-age={{value}}");
+{{/../cacheTime}}
+{{^../cacheTime}}
+    server->sendHeader("Cache-Control", "no-cache");
+{{/../cacheTime}}
+    server->sendHeader("ETag", etag_{{this.dataname}});
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+{{#../cacheTime}}
+    server->sendHeader("Cache-Control", "max-age={{value}}");
+{{/../cacheTime}}
+{{^../cacheTime}}
+    server->sendHeader("Cache-Control", "no-cache");
+{{/../cacheTime}}
+    server->sendHeader("ETag", etag_{{this.dataname}});
+  #endif
+{{/case}}
+{{/switch}}
+
+{{#switch ../gzip}}
+{{#case "true"}}
+{{#if this.isGzip}}
+    server->sendHeader("Content-Encoding", "gzip");
+{{/if}}
+    server->setContentLength({{this.lengthGzip}});
+    server->send(200, "{{this.mime}}", "");
+    {{../definePrefix}}_sendChunked(server, datagzip_{{this.dataname}}, {{this.lengthGzip}});
+{{/case}}
+{{#case "false"}}
+    server->setContentLength({{this.length}});
+    server->send(200, "{{this.mime}}", "");
+    {{../definePrefix}}_sendChunked(server, data_{{this.dataname}}, {{this.length}});
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_GZIP
+{{#if this.isGzip}}
+    server->sendHeader("Content-Encoding", "gzip");
+{{/if}}
+    server->setContentLength({{this.lengthGzip}});
+    server->send(200, "{{this.mime}}", "");
+    {{../definePrefix}}_sendChunked(server, datagzip_{{this.dataname}}, {{this.lengthGzip}});
+  #else
+    server->setContentLength({{this.length}});
+    server->send(200, "{{this.mime}}", "");
+    {{../definePrefix}}_sendChunked(server, data_{{this.dataname}}, {{this.length}});
+  #endif
+{{/case}}
+{{/switch}}
+
+    {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
+  });
+{{/with}}
+{{/if}}
 }`;
 const getTemplate = (engine) => {
     switch (engine) {
@@ -753,6 +1008,8 @@ const createHandlebarsHelpers = () => {
 };
 const getCppCode = (sources, filesByExtension) => {
     const template = (0, handlebars_1.compile)(getTemplate(commandLine_1.cmdLine.engine));
+    const transformedSources = sources.map((s) => transformSourceToTemplateData(s, commandLine_1.cmdLine.etag));
+    const spaSource = commandLine_1.cmdLine.spa ? transformedSources.find((s) => s.isDefault) : undefined;
     const templateData = {
         config: (0, commandLine_1.formatConfiguration)(commandLine_1.cmdLine),
         now: (() => {
@@ -762,7 +1019,7 @@ const getCppCode = (sources, filesByExtension) => {
         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, commandLine_1.cmdLine.etag)),
+        sources: transformedSources,
         filesByExtension,
         etag: commandLine_1.cmdLine.etag,
         gzip: commandLine_1.cmdLine.gzip,
@@ -771,7 +1028,9 @@ const getCppCode = (sources, filesByExtension) => {
         methodName: commandLine_1.cmdLine.espmethod,
         cacheTime: commandLine_1.cmdLine.cachetime ? { value: commandLine_1.cmdLine.cachetime } : undefined,
         definePrefix: commandLine_1.cmdLine.define,
-        basePath: commandLine_1.cmdLine.basePath
+        basePath: commandLine_1.cmdLine.basePath,
+        spa: !!commandLine_1.cmdLine.spa,
+        spaSource
     };
     const rawCode = template(templateData, { helpers: createHandlebarsHelpers() });
     return postProcessCppCode(rawCode);

package/dist/cppCodeEspIdf.d.ts

@@ -1 +1 @@
-export declare const espidfTemplate = "\n//engine:   espidf\n//config:   {{{config}}}\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 unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n  {{#each sources}}\nconst unsigned char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n  {{#each sources}}\nconst unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n#else\n  {{#each sources}}\nconst unsigned 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}}\nstatic const char etag_{{this.dataname}}[] = \"{{this.sha256}}\";\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n  {{#each sources}}\nstatic const char etag_{{this.dataname}}[] = \"{{this.sha256}}\";\n  {{/each}}\n#endif\n{{/case}}\n{{/switch}}\n\n// File manifest struct (C-compatible typedef)\ntypedef struct {\n  const char* path;\n  uint32_t size;\n  uint32_t gzipSize;\n  const char* etag;\n  const char* contentType;\n} {{definePrefix}}_FileInfo;\n\n// File manifest array\nstatic const {{definePrefix}}_FileInfo {{definePrefix}}_FILES[] = {\n{{#each sources}}\n  { \"{{../basePath}}/{{this.filename}}\", {{this.length}}, {{this.gzipSizeForManifest}}, {{this.etagForManifest}}, \"{{this.mime}}\" },\n{{/each}}\n};\nstatic const size_t {{definePrefix}}_FILE_COUNT = sizeof({{definePrefix}}_FILES) / sizeof({{definePrefix}}_FILES[0]);\n\n// File served hook - override with your own implementation\n__attribute__((weak)) void {{definePrefix}}_onFileServed(const char* path, int statusCode) {}\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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }\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                {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 304);\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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }\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                {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 304);\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    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n    httpd_resp_send(req, (const char *)data_{{this.dataname}}, {{this.length}});\n{{/case}}\n{{#case \"compiler\"}}\n    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});\n  #else\n    httpd_resp_send(req, (const char *)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 = \"{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n{{/if}}\n\nstatic const httpd_uri_t route_{{this.datanameUpperCase}} = {\n    .uri = \"{{../basePath}}/{{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//config:   {{{config}}}\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 unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n  {{#each sources}}\nconst unsigned char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n  {{#each sources}}\nconst unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n#else\n  {{#each sources}}\nconst unsigned 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}}\nstatic const char etag_{{this.dataname}}[] = \"{{this.sha256}}\";\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n  {{#each sources}}\nstatic const char etag_{{this.dataname}}[] = \"{{this.sha256}}\";\n  {{/each}}\n#endif\n{{/case}}\n{{/switch}}\n\n// File manifest struct (C-compatible typedef)\ntypedef struct {\n  const char* path;\n  uint32_t size;\n  uint32_t gzipSize;\n  const char* etag;\n  const char* contentType;\n} {{definePrefix}}_FileInfo;\n\n// File manifest array\nstatic const {{definePrefix}}_FileInfo {{definePrefix}}_FILES[] = {\n{{#each sources}}\n  { \"{{../basePath}}/{{this.filename}}\", {{this.length}}, {{this.gzipSizeForManifest}}, {{this.etagForManifest}}, \"{{this.mime}}\" },\n{{/each}}\n};\nstatic const size_t {{definePrefix}}_FILE_COUNT = sizeof({{definePrefix}}_FILES) / sizeof({{definePrefix}}_FILES[0]);\n\n// File served hook - override with your own implementation\n__attribute__((weak)) void {{definePrefix}}_onFileServed(const char* path, int statusCode) {}\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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }\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                {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 304);\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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }\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                {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 304);\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    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n    httpd_resp_send(req, (const char *)data_{{this.dataname}}, {{this.length}});\n{{/case}}\n{{#case \"compiler\"}}\n    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});\n  #else\n    httpd_resp_send(req, (const char *)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 = \"{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n{{/if}}\n\nstatic const httpd_uri_t route_{{this.datanameUpperCase}} = {\n    .uri = \"{{../basePath}}/{{this.filename}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n\n{{/each}}\n\n{{#if spa}}\n{{#with spaSource}}\nstatic esp_err_t spa_handler_{{this.datanameUpperCase}}(httpd_req_t *req, httpd_err_code_t err) {\n{{#if ../basePath}}\n    const char* prefix = \"{{../basePath}}/\";\n    if (strncmp(req->uri, prefix, strlen(prefix)) != 0 && strcmp(req->uri, \"{{../basePath}}\") != 0) {\n        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, \"Not found\");\n        return ESP_FAIL;\n    }\n{{/if}}\n    return file_handler_{{this.datanameUpperCase}}(req);\n}\n{{/with}}\n{{/if}}\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{{#if spa}}\n{{#with spaSource}}\n    httpd_register_err_handler(server, HTTPD_404_NOT_FOUND, spa_handler_{{this.datanameUpperCase}});\n{{/with}}\n{{/if}}\n\n}";

package/dist/cppCodeEspIdf.js

@@ -240,6 +240,20 @@ static const httpd_uri_t route_{{this.datanameUpperCase}} = {
 
 {{/each}}
 
+{{#if spa}}
+{{#with spaSource}}
+static esp_err_t spa_handler_{{this.datanameUpperCase}}(httpd_req_t *req, httpd_err_code_t err) {
+{{#if ../basePath}}
+    const char* prefix = "{{../basePath}}/";
+    if (strncmp(req->uri, prefix, strlen(prefix)) != 0 && strcmp(req->uri, "{{../basePath}}") != 0) {
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "Not found");
+        return ESP_FAIL;
+    }
+{{/if}}
+    return file_handler_{{this.datanameUpperCase}}(req);
+}
+{{/with}}
+{{/if}}
 
 
 static inline void {{methodName}}(httpd_handle_t server) {
@@ -249,5 +263,10 @@ static inline void {{methodName}}(httpd_handle_t server) {
 {{/if}}
     httpd_register_uri_handler(server, &route_{{this.datanameUpperCase}});
 {{/each}}
+{{#if spa}}
+{{#with spaSource}}
+    httpd_register_err_handler(server, HTTPD_404_NOT_FOUND, spa_handler_{{this.datanameUpperCase}});
+{{/with}}
+{{/if}}
 
 }`;

package/dist/index.js

@@ -68,6 +68,8 @@ function main() {
         console.error(`Directory ${commandLine_1.cmdLine.sourcepath} is empty`);
         process.exit(1);
     }
+    if (commandLine_1.cmdLine.spa && ![...files.keys()].some((f) => f === 'index.html' || f === 'index.htm'))
+        console.warn((0, consoleColor_1.yellowLog)('[SvelteESP32] Warning: --spa is set but no index.html/index.htm found; catch-all will not be generated.'));
     console.log();
     console.log('Translation to header file');
     const longestFilename = [...files.keys()].reduce((p, c) => Math.max(c.length, p), 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -59,19 +59,19 @@
     "espasyncwebserver"
   ],
   "devDependencies": {
-    "@eslint/eslintrc": "^3.3.4",
+    "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^10.0.1",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.3.2",
+    "@types/node": "^25.4.0",
     "@types/picomatch": "^4.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.56.1",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
     "@vitest/coverage-v8": "^4.0.18",
-    "eslint": "^10.0.2",
+    "eslint": "^10.0.3",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unicorn": "^63.0.0",
-    "memfs": "^4.56.10",
+    "memfs": "^4.56.11",
     "nodemon": "^3.1.14",
     "prettier": "^3.8.1",
     "ts-node": "^10.9.2",