svelteesp32 1.16.1 → 2.0.1

package/README.md

@@ -6,6 +6,10 @@
 
 [Changelog](CHANGELOG.md)
 
+<p align="center">
+  <img src="svelteesp32.png" alt="svelteesp32" />
+</p>
+
 ---
 
 ## Why SvelteESP32?
@@ -21,7 +25,7 @@
 - **Smart Caching** — Built-in SHA256 ETags deliver HTTP 304 responses, slashing bandwidth on constrained devices.
 - **CI/CD Ready** — Simple npm package that slots into any build pipeline.
 - **Zero Runtime Overhead** — Data served directly from flash. No filesystem reads, no RAM allocation.
-- **4 Web Server Engines** — PsychicHttp V1/V2, ESPAsyncWebServer, and native ESP-IDF supported.
+- **3 Web Server Engines** — PsychicHttpServer, ESPAsyncWebServer, and native ESP-IDF supported.
 
 ---
 
@@ -75,13 +79,14 @@ void setup() {
 
 ## What's New
 
+- **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`)
 - **v1.13.0** — npm package variable interpolation in RC files
 - **v1.12.0** — RC file configuration support
 - **v1.11.0** — File exclusion patterns
 - **v1.9.0** — Native ESP-IDF engine
-- **v1.5.0** — PsychicHttp V2 support
 
 ---
 
@@ -108,9 +113,6 @@ Choose your web server engine:
 # PsychicHttpServer (recommended for ESP32)
 npx svelteesp32 -e psychic -s ./dist -o ./esp32/svelteesp32.h --etag=true
 
-# PsychicHttpServer V2
-npx svelteesp32 -e psychic2 -s ./dist -o ./esp32/svelteesp32.h --etag=true
-
 # ESPAsyncWebServer (ESP32 + ESP8266)
 npx svelteesp32 -e async -s ./dist -o ./esp32/svelteesp32.h --etag=true
 
@@ -141,7 +143,7 @@ Watch your files get optimized in real-time:
 
 ### ESP32 Integration
 
-**PsychicHttpServer (Recommended)**
+**PsychicHttpServer V2 (Recommended)**
 
 ```c
 #include <PsychicHttp.h>
@@ -184,14 +186,14 @@ void app_main() {
 }
 ```
 
-Working examples: [Arduino/PlatformIO](demo/esp32) | [ESP-IDF](demo/esp32idf)
+Working examples with LED control via web interface: [Arduino/PlatformIO](demo/esp32) | [ESP-IDF](demo/esp32idf)
 
 ### What Gets Generated
 
 The generated header file includes everything your ESP needs:
 
 ```c
-//engine:   PsychicHttpServer
+//engine:   PsychicHttpServer V2
 //config:   engine=psychic sourcepath=./dist outputfile=./output.h etag=true gzip=true cachetime=0 espmethod=initSvelteStaticFiles define=SVELTEESP32
 //
 #define SVELTEESP32_COUNT 5
@@ -232,23 +234,21 @@ const size_t SVELTEESP32_FILE_COUNT = sizeof(SVELTEESP32_FILES) / sizeof(SVELTEE
 extern "C" void __attribute__((weak)) SVELTEESP32_onFileServed(const char* path, int statusCode) {}
 
 void initSvelteStaticFiles(PsychicHttpServer * server) {
-  server->on("/assets/index-KwubEIf-.js", HTTP_GET, [](PsychicRequest * request) {
+  server->on("/assets/index-KwubEIf-.js", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {
     if (request->hasHeader("If-None-Match") &&
         request->header("If-None-Match").equals(etag_assets_index_KwubEIf__js)) {
-      PsychicResponse response304(request);
-      response304.setCode(304);
+      response->setCode(304);
       SVELTEESP32_onFileServed("/assets/index-KwubEIf-.js", 304);
-      return response304.send();
+      return response->send();
     }
 
-    PsychicResponse response(request);
-    response.setContentType("text/javascript");
-    response.addHeader("Content-Encoding", "gzip");
-    response.addHeader("Cache-Control", "no-cache");
-    response.addHeader("ETag", etag_assets_index_KwubEIf__js);
-    response.setContent(datagzip_assets_index_KwubEIf__js, 12547);
+    response->setContentType("text/javascript");
+    response->addHeader("Content-Encoding", "gzip");
+    response->addHeader("Cache-Control", "no-cache");
+    response->addHeader("ETag", etag_assets_index_KwubEIf__js);
+    response->setContent(datagzip_assets_index_KwubEIf__js, 12547);
     SVELTEESP32_onFileServed("/assets/index-KwubEIf-.js", 200);
-    return response.send();
+    return response->send();
   });
 
   // ... more routes
@@ -259,14 +259,13 @@ void initSvelteStaticFiles(PsychicHttpServer * server) {
 
 ## Supported Web Server Engines
 
-| Engine                | Flag          | Best For                     | Platform        |
-| --------------------- | ------------- | ---------------------------- | --------------- |
-| **PsychicHttp V1**    | `-e psychic`  | Maximum performance          | ESP32 only      |
-| **PsychicHttp V2**    | `-e psychic2` | Modern API + performance     | ESP32 only      |
-| **ESPAsyncWebServer** | `-e async`    | Cross-platform compatibility | ESP32 + ESP8266 |
-| **Native ESP-IDF**    | `-e espidf`   | Pure ESP-IDF projects        | ESP32 only      |
+| Engine                   | Flag         | Best For                     | Platform        |
+| ------------------------ | ------------ | ---------------------------- | --------------- |
+| **PsychicHttpServer V2** | `-e psychic` | Maximum performance          | ESP32 only      |
+| **ESPAsyncWebServer**    | `-e async`   | Cross-platform compatibility | ESP32 + ESP8266 |
+| **Native ESP-IDF**       | `-e espidf`  | Pure ESP-IDF projects        | ESP32 only      |
 
-**Recommendation:** For ESP32-only projects, use PsychicHttpServer for the fastest, most stable experience.
+**Recommendation:** For ESP32-only projects, use PsychicHttpServer V2 (`-e psychic`) for the fastest, most stable experience.
 
 **Note:** For PsychicHttp, configure `server.config.max_uri_handlers` to match your file count.
 
@@ -289,7 +288,7 @@ Reduce bandwidth dramatically with HTTP 304 "Not Modified" responses. When a bro
 - **Minimal overhead** — adds ~1-3% code size for significant bandwidth savings
 - **Compiler mode** — use `--etag=compiler` and control via `-D SVELTEESP32_ENABLE_ETAG`
 
-All four engines support full ETag validation.
+All three engines support full ETag validation.
 
 ### Browser Cache Control
 
@@ -403,24 +402,25 @@ 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/psychic2/async/espidf) | `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`   |
-| `--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)         | `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                                        |                         |
 
 ---
 
@@ -439,7 +439,8 @@ Store your settings in `.svelteesp32rc.json` for zero-argument builds:
   "basepath": "/ui",
   "maxsize": "400k",
   "maxgzipsize": "150k",
-  "noindexcheck": false
+  "noindexcheck": false,
+  "dryrun": false
 }
 ```
 

package/dist/commandLine.d.ts

@@ -1,5 +1,5 @@
 interface ICopyFilesArguments {
-    engine: 'psychic' | 'psychic2' | 'async' | 'espidf';
+    engine: 'psychic' | 'async' | 'espidf';
     sourcepath: string;
     outputfile: string;
     espmethod: string;
@@ -14,10 +14,11 @@ interface ICopyFilesArguments {
     maxSize?: number;
     maxGzipSize?: number;
     noIndexCheck?: boolean;
+    dryRun?: boolean;
     help?: boolean;
 }
 interface IRcFileConfig {
-    engine?: 'psychic' | 'psychic2' | 'async' | 'espidf';
+    engine?: 'psychic' | 'async' | 'espidf';
     sourcepath?: string;
     outputfile?: string;
     espmethod?: string;
@@ -32,11 +33,13 @@ interface IRcFileConfig {
     maxsize?: number | string;
     maxgzipsize?: number | string;
     noindexcheck?: boolean;
+    dryrun?: boolean;
 }
+declare function validateCppIdentifier(value: string, name: string): string;
 declare function parseSize(value: string, name: string): number;
 declare function getNpmPackageVariable(packageJson: Record<string, unknown>, variableName: string): string | undefined;
 declare function hasNpmVariables(config: IRcFileConfig): boolean;
 declare function interpolateNpmVariables(config: IRcFileConfig, rcFilePath: string): IRcFileConfig;
-export { getNpmPackageVariable, hasNpmVariables, interpolateNpmVariables, parseSize };
+export { getNpmPackageVariable, hasNpmVariables, interpolateNpmVariables, parseSize, validateCppIdentifier };
 export declare function formatConfiguration(cmdLine: ICopyFilesArguments): string;
 export declare const cmdLine: ICopyFilesArguments;

package/dist/commandLine.js

@@ -8,6 +8,7 @@ exports.getNpmPackageVariable = getNpmPackageVariable;
 exports.hasNpmVariables = hasNpmVariables;
 exports.interpolateNpmVariables = interpolateNpmVariables;
 exports.parseSize = parseSize;
+exports.validateCppIdentifier = validateCppIdentifier;
 exports.formatConfiguration = formatConfiguration;
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
@@ -23,7 +24,7 @@ Configuration:
 
 Options:
   -e, --engine <value>       The engine for which the include file is created
-                             (psychic|psychic2|async|espidf) (default: "psychic")
+                             (psychic|async|espidf) (default: "psychic")
   -s, --sourcepath <path>    Source dist folder contains compiled web files (required)
   -o, --outputfile <path>    Generated output file with path (default: "svelteesp32.h")
   --etag <value>             Use ETAG header for cache (true|false|compiler) (default: "false")
@@ -38,6 +39,7 @@ Options:
   --basepath <path>          URL prefix for all routes (e.g., "/ui") (default: "")
   --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)
   -h, --help                 Shows this help
 
 RC File:
@@ -64,7 +66,7 @@ RC File:
     process.exit(0);
 }
 function validateEngine(value) {
-    if (value === 'psychic' || value === 'psychic2' || value === 'async' || value === 'espidf')
+    if (value === 'psychic' || value === 'async' || value === 'espidf')
         return value;
     console.error((0, errorMessages_1.getInvalidEngineError)(value));
     process.exit(1);
@@ -74,6 +76,11 @@ function validateTriState(value, name) {
         return value;
     throw new Error(`Invalid ${name}: ${value}`);
 }
+function validateCppIdentifier(value, name) {
+    if (!/^[A-Z_a-z]\w*$/.test(value))
+        throw new Error(`${name} must be a valid C++ identifier (letters, digits, underscores, not starting with a digit): ${value}`);
+    return value;
+}
 function validateBasePath(value) {
     if (value === '')
         return value;
@@ -144,7 +151,9 @@ function parsePackageJson(packageJsonPath) {
         return JSON.parse(content);
     }
     catch (error) {
-        throw new Error(`Failed to parse package.json at ${packageJsonPath}: ${error.message}`);
+        throw new Error(`Failed to parse package.json at ${packageJsonPath}: ${error.message}`, {
+            cause: error
+        });
     }
 }
 function getNpmPackageVariable(packageJson, variableName) {
@@ -235,7 +244,7 @@ function loadRcFile(rcPath) {
     }
     catch (error) {
         if (error instanceof SyntaxError)
-            throw new Error(`Invalid JSON in RC file ${rcPath}: ${error.message}`);
+            throw new Error(`Invalid JSON in RC file ${rcPath}: ${error.message}`, { cause: error });
         throw error;
     }
 }
@@ -258,7 +267,8 @@ function validateRcConfig(config, rcPath) {
         'basepath',
         'maxsize',
         'maxgzipsize',
-        'noindexcheck'
+        'noindexcheck',
+        'dryrun'
     ]);
     for (const key of Object.keys(configObject))
         if (!validKeys.has(key))
@@ -269,9 +279,16 @@ function validateRcConfig(config, rcPath) {
         configObject['etag'] = validateTriState(configObject['etag'], 'etag');
     if (configObject['gzip'] !== undefined)
         configObject['gzip'] = validateTriState(configObject['gzip'], 'gzip');
-    if (configObject['cachetime'] !== undefined &&
-        (typeof configObject['cachetime'] !== 'number' || Number.isNaN(configObject['cachetime'])))
-        throw new TypeError(`Invalid cachetime in RC file: ${configObject['cachetime']}`);
+    if (configObject['espmethod'] !== undefined)
+        validateCppIdentifier(configObject['espmethod'], 'espmethod');
+    if (configObject['define'] !== undefined)
+        validateCppIdentifier(configObject['define'], 'define');
+    if (configObject['cachetime'] !== undefined) {
+        if (typeof configObject['cachetime'] !== 'number' || Number.isNaN(configObject['cachetime']))
+            throw new TypeError(`Invalid cachetime in RC file: ${configObject['cachetime']}`);
+        if (configObject['cachetime'] < 0)
+            throw new TypeError(`Invalid cachetime in RC file: ${configObject['cachetime']} (must be non-negative)`);
+    }
     if (configObject['exclude'] !== undefined) {
         if (!Array.isArray(configObject['exclude']))
             throw new TypeError("'exclude' in RC file must be an array");
@@ -305,6 +322,8 @@ function validateRcConfig(config, rcPath) {
     }
     if (configObject['noindexcheck'] !== undefined && typeof configObject['noindexcheck'] !== 'boolean')
         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)`);
     return configObject;
 }
 function parseArguments() {
@@ -368,9 +387,67 @@ function parseArguments() {
         result.maxGzipSize = rcConfig.maxgzipsize;
     if (rcConfig.noindexcheck !== undefined)
         result.noIndexCheck = rcConfig.noindexcheck;
+    if (rcConfig.dryrun !== undefined)
+        result.dryRun = rcConfig.dryrun;
     if (rcConfig.exclude && rcConfig.exclude.length > 0)
         result.exclude = [...rcConfig.exclude];
     const cliExclude = [];
+    function applyFlag(flagName, value) {
+        switch (flagName) {
+            case 'config':
+                break;
+            case 'engine':
+                result.engine = validateEngine(value);
+                break;
+            case 'sourcepath':
+                result.sourcepath = value;
+                break;
+            case 'outputfile':
+                result.outputfile = value;
+                break;
+            case 'etag':
+                result.etag = validateTriState(value, 'etag');
+                break;
+            case 'gzip':
+                result.gzip = validateTriState(value, 'gzip');
+                break;
+            case 'version':
+                result.version = value;
+                break;
+            case 'espmethod':
+                result.espmethod = validateCppIdentifier(value, 'espmethod');
+                break;
+            case 'define':
+                result.define = validateCppIdentifier(value, 'define');
+                break;
+            case 'cachetime':
+                result.cachetime = Number.parseInt(value, 10);
+                if (Number.isNaN(result.cachetime))
+                    throw new TypeError(`Invalid cachetime: ${value}`);
+                if (result.cachetime < 0)
+                    throw new TypeError(`Invalid cachetime: ${value} (must be non-negative)`);
+                break;
+            case 'exclude': {
+                const patterns = value
+                    .split(',')
+                    .map((p) => p.trim())
+                    .filter(Boolean);
+                cliExclude.push(...patterns);
+                break;
+            }
+            case 'basepath':
+                result.basePath = validateBasePath(value);
+                break;
+            case 'maxsize':
+                result.maxSize = parseSize(value, '--maxsize');
+                break;
+            case 'maxgzipsize':
+                result.maxGzipSize = parseSize(value, '--maxgzipsize');
+                break;
+            default:
+                throw new Error(`Unknown flag: --${flagName}`);
+        }
+    }
     for (let index = 0; index < arguments_.length; index++) {
         const argument = arguments_[index];
         if (!argument)
@@ -383,59 +460,7 @@ function parseArguments() {
             const value = parts.slice(1).join('=');
             if (!flag || !value)
                 throw new Error(`Invalid argument format: ${argument}`);
-            const flagName = flag.slice(2);
-            switch (flagName) {
-                case 'config':
-                    break;
-                case 'engine':
-                    result.engine = validateEngine(value);
-                    break;
-                case 'sourcepath':
-                    result.sourcepath = value;
-                    break;
-                case 'outputfile':
-                    result.outputfile = value;
-                    break;
-                case 'etag':
-                    result.etag = validateTriState(value, 'etag');
-                    break;
-                case 'gzip':
-                    result.gzip = validateTriState(value, 'gzip');
-                    break;
-                case 'version':
-                    result.version = value;
-                    break;
-                case 'espmethod':
-                    result.espmethod = value;
-                    break;
-                case 'define':
-                    result.define = value;
-                    break;
-                case 'cachetime':
-                    result.cachetime = Number.parseInt(value, 10);
-                    if (Number.isNaN(result.cachetime))
-                        throw new TypeError(`Invalid cachetime: ${value}`);
-                    break;
-                case 'exclude': {
-                    const patterns = value
-                        .split(',')
-                        .map((p) => p.trim())
-                        .filter(Boolean);
-                    cliExclude.push(...patterns);
-                    break;
-                }
-                case 'basepath':
-                    result.basePath = validateBasePath(value);
-                    break;
-                case 'maxsize':
-                    result.maxSize = parseSize(value, '--maxsize');
-                    break;
-                case 'maxgzipsize':
-                    result.maxGzipSize = parseSize(value, '--maxgzipsize');
-                    break;
-                default:
-                    throw new Error(`Unknown flag: ${flag}`);
-            }
+            applyFlag(flag.slice(2), value);
             continue;
         }
         if (argument === '--created') {
@@ -446,6 +471,10 @@ function parseArguments() {
             result.noIndexCheck = true;
             continue;
         }
+        if (argument === '--dryrun' || argument === '--dry-run') {
+            result.dryRun = true;
+            continue;
+        }
         if (argument.startsWith('-') && !argument.startsWith('--')) {
             const flag = argument.slice(1);
             const nextArgument = arguments_[index + 1];
@@ -474,72 +503,8 @@ function parseArguments() {
             const nextArgument = arguments_[index + 1];
             if (!nextArgument || nextArgument.startsWith('-'))
                 throw new Error(`Missing value for flag: ${argument}`);
-            switch (flag) {
-                case 'config':
-                    index++;
-                    break;
-                case 'engine':
-                    result.engine = validateEngine(nextArgument);
-                    index++;
-                    break;
-                case 'sourcepath':
-                    result.sourcepath = nextArgument;
-                    index++;
-                    break;
-                case 'outputfile':
-                    result.outputfile = nextArgument;
-                    index++;
-                    break;
-                case 'etag':
-                    result.etag = validateTriState(nextArgument, 'etag');
-                    index++;
-                    break;
-                case 'gzip':
-                    result.gzip = validateTriState(nextArgument, 'gzip');
-                    index++;
-                    break;
-                case 'version':
-                    result.version = nextArgument;
-                    index++;
-                    break;
-                case 'espmethod':
-                    result.espmethod = nextArgument;
-                    index++;
-                    break;
-                case 'define':
-                    result.define = nextArgument;
-                    index++;
-                    break;
-                case 'cachetime':
-                    result.cachetime = Number.parseInt(nextArgument, 10);
-                    if (Number.isNaN(result.cachetime))
-                        throw new TypeError(`Invalid cachetime: ${nextArgument}`);
-                    index++;
-                    break;
-                case 'exclude': {
-                    const patterns = nextArgument
-                        .split(',')
-                        .map((p) => p.trim())
-                        .filter(Boolean);
-                    cliExclude.push(...patterns);
-                    index++;
-                    break;
-                }
-                case 'basepath':
-                    result.basePath = validateBasePath(nextArgument);
-                    index++;
-                    break;
-                case 'maxsize':
-                    result.maxSize = parseSize(nextArgument, '--maxsize');
-                    index++;
-                    break;
-                case 'maxgzipsize':
-                    result.maxGzipSize = parseSize(nextArgument, '--maxgzipsize');
-                    index++;
-                    break;
-                default:
-                    throw new Error(`Unknown flag: --${flag}`);
-            }
+            applyFlag(flag, nextArgument);
+            index++;
             continue;
         }
         throw new Error(`Unknown argument: ${argument}`);

package/dist/cppCode.js

@@ -120,212 +120,6 @@ extern "C" void __attribute__((weak)) {{definePrefix}}_onFileServed(const char*
 const psychicTemplate = `
 //engine:   PsychicHttpServer
 //config:   {{{config}}}
-//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}
-
-//
-${manifestSection}
-
-//
-${hookSection}
-
-//
-// Http Handlers
-void {{methodName}}(PsychicHttpServer * server) {
-{{#each sources}}
-//
-// {{this.filename}}
-  {{#if this.isDefault}}{{#unless ../basePath}}server->defaultEndpoint = {{/unless}}{{/if}}server->on("{{../basePath}}/{{this.filename}}", HTTP_GET, [](PsychicRequest * request) {
-
-{{#switch ../etag}}
-{{#case "true"}}
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
-      PsychicResponse response304(request);
-      response304.setCode(304);
-      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
-      return response304.send();
-    }
-{{/case}}
-{{#case "compiler"}}
-  #ifdef {{../definePrefix}}_ENABLE_ETAG
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
-      PsychicResponse response304(request);
-      response304.setCode(304);
-      {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 304);
-      return response304.send();
-    }
-  #endif
-{{/case}}
-{{/switch}}
-
-    PsychicResponse response(request);
-    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 this.isDefault}}{{#if ../basePath}}
-//
-// {{this.filename}} (base path route)
-  server->on("{{../basePath}}", HTTP_GET, [](PsychicRequest * request) {
-
-{{#switch ../etag}}
-{{#case "true"}}
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
-      PsychicResponse response304(request);
-      response304.setCode(304);
-      {{../definePrefix}}_onFileServed("{{../basePath}}", 304);
-      return response304.send();
-    }
-{{/case}}
-{{#case "compiler"}}
-  #ifdef {{../definePrefix}}_ENABLE_ETAG
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
-      PsychicResponse response304(request);
-      response304.setCode(304);
-      {{../definePrefix}}_onFileServed("{{../basePath}}", 304);
-      return response304.send();
-    }
-  #endif
-{{/case}}
-{{/switch}}
-
-    PsychicResponse response(request);
-    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}}", 200);
-    return response.send();
-  });
-{{/if}}{{/if}}
-
-{{/each}}
-}`;
-const psychic2Template = `
-//engine:   PsychicHttpServerV2
-//config:   {{{config}}}
 {{#if created }}
 //created:  {{now}}
 {{/if}}
@@ -704,21 +498,29 @@ const getTemplate = (engine) => {
     switch (engine) {
         case 'psychic':
             return psychicTemplate;
-        case 'psychic2':
-            return psychic2Template;
+        case 'async':
+            return asyncTemplate;
         case 'espidf':
             return cppCodeEspIdf_1.espidfTemplate;
         default:
-            return asyncTemplate;
+            throw new Error(`Unknown engine: ${engine}`);
     }
 };
+const bufferToByteString = (buffer) => {
+    if (buffer.length === 0)
+        return '';
+    let result = buffer[0].toString(10);
+    for (let index = 1; index < buffer.length; index++)
+        result += ',' + buffer[index].toString(10);
+    return result;
+};
 const transformSourceToTemplateData = (s, etag) => ({
     ...s,
     length: s.content.length,
-    bytes: [...s.content].map((v) => `${v.toString(10)}`).join(','),
+    bytes: bufferToByteString(s.content),
     lengthGzip: s.contentGzip.length,
-    bytesGzip: [...s.contentGzip].map((v) => `${v.toString(10)}`).join(','),
-    isDefault: s.filename.startsWith('index.htm'),
+    bytesGzip: bufferToByteString(s.contentGzip),
+    isDefault: s.filename === 'index.html' || s.filename === 'index.htm',
     gzipSizeForManifest: s.isGzip ? s.contentGzip.length : 0,
     etagForManifest: etag === 'false' ? 'NULL' : `etag_${s.dataname}`
 });
@@ -728,7 +530,7 @@ const postProcessCppCode = (code) => code
     .filter(Boolean)
     .map((line) => (line === '//' ? '' : line))
     .join('\n')
-    .replace(/\\n{2}/, '\n');
+    .replace(/\n{2,}/g, '\n');
 const createHandlebarsHelpers = () => {
     let switchValue;
     return {
@@ -752,7 +554,10 @@ const getCppCode = (sources, filesByExtension) => {
     const template = (0, handlebars_1.compile)(getTemplate(commandLine_1.cmdLine.engine));
     const templateData = {
         config: (0, commandLine_1.formatConfiguration)(commandLine_1.cmdLine),
-        now: `${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`,
+        now: (() => {
+            const d = new Date();
+            return `${d.toLocaleDateString()} ${d.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(),

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 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}}\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 (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 (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, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    {{../definePrefix}}_onFileServed(\"{{../basePath}}/{{this.filename}}\", 200);\n    httpd_resp_send(req, 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, 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 = \"{{#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\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

@@ -63,22 +63,22 @@ exports.espidfTemplate = `
 {{#switch gzip}}
 {{#case "true"}}
   {{#each sources}}
-const char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
+const unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
   {{/each}}
 {{/case}}
 {{#case "false"}}
   {{#each sources}}
-const char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
+const unsigned char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
   {{/each}}
 {{/case}}
 {{#case "compiler"}}
 #ifdef {{definePrefix}}_ENABLE_GZIP
   {{#each sources}}
-const char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
+const unsigned char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };
   {{/each}}
 #else
   {{#each sources}}
-const char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
+const unsigned char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };
   {{/each}}
 #endif 
 {{/case}}
@@ -131,6 +131,7 @@ static esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)
     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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }
         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);
@@ -148,6 +149,7 @@ static esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)
     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 (hdr_value == NULL) { httpd_resp_send_500(req); return ESP_FAIL; }
         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);
@@ -204,18 +206,18 @@ static esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)
 {{#switch ../gzip}}
 {{#case "true"}}
     {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
-    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});
+    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});
 {{/case}}
 {{#case "false"}}
     {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
-    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});
+    httpd_resp_send(req, (const char *)data_{{this.dataname}}, {{this.length}});
 {{/case}}
 {{#case "compiler"}}
     {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
   #ifdef {{../definePrefix}}_ENABLE_GZIP
-    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});
+    httpd_resp_send(req, (const char *)datagzip_{{this.dataname}}, {{this.lengthGzip}});
   #else
-    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});
+    httpd_resp_send(req, (const char *)data_{{this.dataname}}, {{this.length}});
   #endif
 {{/case}}
 {{/switch}}

package/dist/errorMessages.d.ts

@@ -2,4 +2,4 @@ export declare function getMissingIndexError(engine: string): string;
 export declare function getInvalidEngineError(attempted: string): string;
 export declare function getSourcepathNotFoundError(sourcepath: string, reason: 'not_found' | 'not_directory'): string;
 export declare function getSizeBudgetExceededError(type: 'size' | 'gzipSize', limit: number, actual: number): string;
-export declare function getMaxUriHandlersHint(engine: string, routeCount: number): string;
+export declare function getMaxUriHandlersHint(engine: string, routeCount: number, espmethod?: string): string;

package/dist/errorMessages.js

@@ -13,7 +13,6 @@ const consoleColor_1 = require("./consoleColor");
 function getEngineName(engine) {
     const names = {
         psychic: 'PsychicHttpServer',
-        psychic2: 'PsychicHttpServer V2',
         async: 'ESPAsyncWebServer',
         espidf: 'ESP-IDF'
     };
@@ -24,9 +23,6 @@ function getMissingIndexError(engine) {
         psychic: `  1. Add an index.html file to your source directory
   2. The file will automatically be set as the default route ("/")
   3. PsychicHttpServer uses: server->defaultEndpoint = ...`,
-        psychic2: `  1. Add an index.html file to your source directory
-  2. The file will automatically be set as the default route ("/")
-  3. PsychicHttpServer V2 uses: server->defaultEndpoint = ...`,
         async: `  1. Add an index.html file to your source directory
   2. The file will automatically create a "/" route handler
   3. ESPAsyncWebServer uses: server.on("/", HTTP_GET, ...)`,
@@ -55,7 +51,6 @@ function getInvalidEngineError(attempted) {
 
 Valid engines are:
   ${(0, consoleColor_1.cyanLog)('• psychic')}    - PsychicHttpServer (ESP32 only, fastest performance)
-  ${(0, consoleColor_1.cyanLog)('• psychic2')}   - PsychicHttpServer V2 (ESP32 only, modern API)
   ${(0, consoleColor_1.cyanLog)('• async')}      - ESPAsyncWebServer (ESP32/ESP8266 compatible)
   ${(0, consoleColor_1.cyanLog)('• espidf')}     - Native ESP-IDF web server (ESP32 only, no Arduino)
 
@@ -136,22 +131,18 @@ CI integration:
   This non-zero exit code allows build pipelines to fail early when
   the frontend exceeds allocated flash space.`);
 }
-function getMaxUriHandlersHint(engine, routeCount) {
+function getMaxUriHandlersHint(engine, routeCount, espmethod = 'initSvelteStaticFiles') {
     const recommended = routeCount + 5;
     const hints = {
         psychic: `PsychicHttpServer server;
   server.config.max_uri_handlers = ${recommended};  // Default is 8, you need at least ${routeCount}
-  initSvelteStaticFiles(&server);
-  server.listen(80);`,
-        psychic2: `PsychicHttpServer server;
-  server.config.max_uri_handlers = ${recommended};  // Default is 8, you need at least ${routeCount}
-  initSvelteStaticFiles(&server);
+  ${espmethod}(&server);
   server.listen(80);`,
         espidf: `httpd_config_t config = HTTPD_DEFAULT_CONFIG();
   config.max_uri_handlers = ${recommended};  // Default is 8, you need at least ${routeCount}
   httpd_handle_t server = NULL;
   httpd_start(&server, &config);
-  initSvelteStaticFiles(server);`
+  ${espmethod}(server);`
     };
     const hint = hints[engine];
     if (!hint)

package/dist/file.d.ts

@@ -1 +1,5 @@
-export declare const getFiles: () => Map<string, Buffer>;
+export type FileData = {
+    content: Buffer;
+    hash: string;
+};
+export declare const getFiles: () => Map<string, FileData>;

package/dist/file.js

@@ -14,13 +14,12 @@ const consoleColor_1 = require("./consoleColor");
 const errorMessages_1 = require("./errorMessages");
 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');
-        const existingFiles = contentComparer.get(hash);
+    for (const [filename, fileData] of files.entries()) {
+        const existingFiles = contentComparer.get(fileData.hash);
         if (existingFiles)
             existingFiles.push(filename);
         else
-            contentComparer.set(hash, [filename]);
+            contentComparer.set(fileData.hash, [filename]);
     }
     const result = [];
     for (const filenames of contentComparer.values())
@@ -30,7 +29,7 @@ const findSimilarFiles = (files) => {
 };
 const shouldSkipFile = (filename, allFilenames) => {
     const extension = node_path_1.default.extname(filename);
-    const compressedExtensions = ['.gz', '.brottli', '.br'];
+    const compressedExtensions = ['.gz', '.brotli', '.br'];
     if (compressedExtensions.includes(extension)) {
         const original = filename.slice(0, -1 * extension.length);
         if (allFilenames.includes(original)) {
@@ -72,10 +71,14 @@ const getFiles = () => {
             console.log((0, consoleColor_1.cyanLog)(`... and ${excludedFiles.length - displayLimit} more`));
         console.log();
     }
+    else if (excludePatterns.length > 0)
+        console.log((0, consoleColor_1.yellowLog)(`Warning: --exclude patterns matched no files: ${excludePatterns.join(', ')}`));
     const result = new Map();
     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 content = (0, node_fs_1.readFileSync)(filePath, { flag: 'r' });
+        const hash = (0, node_crypto_1.createHash)('sha256').update(content).digest('hex');
+        result.set(filename, { content, hash });
     }
     const duplicates = findSimilarFiles(result);
     for (const sameFiles of duplicates)

package/dist/index.d.ts

@@ -1,7 +1,9 @@
-import { CppCodeSource } from './cppCode';
+import { CppCodeSource, ExtensionGroups } from './cppCode';
 declare const shouldUseGzip: (originalSize: number, compressedSize: number) => boolean;
 declare const calculateCompressionRatio: (originalSize: number, compressedSize: number) => number;
 declare const formatCompressionLog: (filename: string, padding: string, originalSize: number, compressedSize: number, useGzip: boolean) => string;
+declare const formatSize: (bytes: number) => string;
 declare const createSourceEntry: (filename: string, dataname: string, content: Buffer, contentGzip: Buffer, mimeType: string, sha256: string, isGzip: boolean) => CppCodeSource;
-declare const updateExtensionGroup: (extension: string) => void;
-export { calculateCompressionRatio, createSourceEntry, formatCompressionLog, shouldUseGzip, updateExtensionGroup };
+declare const updateExtensionGroup: (filesByExtension: ExtensionGroups, extension: string) => void;
+export declare function main(): void;
+export { calculateCompressionRatio, createSourceEntry, formatCompressionLog, formatSize, shouldUseGzip, updateExtensionGroup };

package/dist/index.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateExtensionGroup = exports.shouldUseGzip = exports.formatCompressionLog = exports.createSourceEntry = exports.calculateCompressionRatio = void 0;
-const node_crypto_1 = require("node:crypto");
+exports.updateExtensionGroup = exports.shouldUseGzip = exports.formatSize = exports.formatCompressionLog = exports.createSourceEntry = exports.calculateCompressionRatio = void 0;
+exports.main = main;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const node_zlib_1 = require("node:zlib");
@@ -16,13 +16,6 @@ const errorMessages_1 = require("./errorMessages");
 const file_1 = require("./file");
 const GZIP_MIN_SIZE = 1024;
 const GZIP_MIN_REDUCTION_RATIO = 0.85;
-const summary = {
-    filecount: 0,
-    size: 0,
-    gzipsize: 0
-};
-const sources = [];
-const filesByExtension = [];
 const shouldUseGzip = (originalSize, compressedSize) => originalSize > GZIP_MIN_SIZE && compressedSize < originalSize * GZIP_MIN_REDUCTION_RATIO;
 exports.shouldUseGzip = shouldUseGzip;
 const calculateCompressionRatio = (originalSize, compressedSize) => Math.round((compressedSize / originalSize) * 100);
@@ -36,6 +29,12 @@ const formatCompressionLog = (filename, padding, originalSize, compressedSize, u
     return (0, consoleColor_1.yellowLog)(` [${filename}] ${padding} x gzip unused ${tooSmall}${sizeInfo}`);
 };
 exports.formatCompressionLog = formatCompressionLog;
+const formatSize = (bytes) => {
+    if (bytes < 1024)
+        return `${bytes}B`;
+    return `${Math.round(bytes / 1024)}kB`;
+};
+exports.formatSize = formatSize;
 const createSourceEntry = (filename, dataname, content, contentGzip, mimeType, sha256, isGzip) => ({
     filename,
     dataname,
@@ -47,7 +46,7 @@ const createSourceEntry = (filename, dataname, content, contentGzip, mimeType, s
     sha256
 });
 exports.createSourceEntry = createSourceEntry;
-const updateExtensionGroup = (extension) => {
+const updateExtensionGroup = (filesByExtension, extension) => {
     const group = filesByExtension.find((fe) => fe.extension === extension);
     if (group)
         group.count += 1;
@@ -55,47 +54,66 @@ const updateExtensionGroup = (extension) => {
         filesByExtension.push({ extension, count: 1 });
 };
 exports.updateExtensionGroup = updateExtensionGroup;
-console.log('Collecting source files');
-const files = (0, file_1.getFiles)();
-if (files.size === 0) {
-    console.error(`Directory ${commandLine_1.cmdLine.sourcepath} is empty`);
-    process.exit(1);
-}
-console.log();
-console.log('Translation to header file');
-const longestFilename = [...files.keys()].reduce((p, c) => Math.max(c.length, p), 0);
-for (const [originalFilename, content] of files) {
-    const mimeType = (0, mime_types_1.lookup)(originalFilename) || 'text/plain';
-    summary.filecount++;
-    const filename = originalFilename.replace(/\\/g, '/');
-    const dataname = filename.replace(/[!&()+./@{}~-]/g, '_');
-    let extension = node_path_1.default.extname(filename).toUpperCase();
-    if (extension.startsWith('.'))
-        extension = extension.slice(1);
-    updateExtensionGroup(extension);
-    const sha256 = (0, node_crypto_1.createHash)('sha256').update(content).digest('hex');
-    summary.size += content.length;
-    const zipContent = (0, node_zlib_1.gzipSync)(content, { level: 9 });
-    summary.gzipsize += zipContent.length;
-    const useGzip = shouldUseGzip(content.length, zipContent.length);
-    sources.push(createSourceEntry(filename, dataname, content, zipContent, mimeType, sha256, 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));
-if (commandLine_1.cmdLine.maxSize !== undefined && summary.size > commandLine_1.cmdLine.maxSize) {
-    console.error((0, errorMessages_1.getSizeBudgetExceededError)('size', commandLine_1.cmdLine.maxSize, summary.size));
-    process.exit(1);
-}
-if (commandLine_1.cmdLine.maxGzipSize !== undefined && summary.gzipsize > commandLine_1.cmdLine.maxGzipSize) {
-    console.error((0, errorMessages_1.getSizeBudgetExceededError)('gzipSize', commandLine_1.cmdLine.maxGzipSize, summary.gzipsize));
-    process.exit(1);
+function main() {
+    const summary = {
+        filecount: 0,
+        size: 0,
+        gzipsize: 0
+    };
+    const sources = [];
+    const filesByExtension = [];
+    console.log('Collecting source files');
+    const files = (0, file_1.getFiles)();
+    if (files.size === 0) {
+        console.error(`Directory ${commandLine_1.cmdLine.sourcepath} is empty`);
+        process.exit(1);
+    }
+    console.log();
+    console.log('Translation to header file');
+    const longestFilename = [...files.keys()].reduce((p, c) => Math.max(c.length, p), 0);
+    for (const [originalFilename, fileData] of files) {
+        const { content, hash: sha256 } = fileData;
+        const mimeType = (0, mime_types_1.lookup)(originalFilename) || 'text/plain';
+        if (!(0, mime_types_1.lookup)(originalFilename))
+            console.log((0, consoleColor_1.yellowLog)(` [${originalFilename}] unknown MIME type for extension '${node_path_1.default.extname(originalFilename)}', using text/plain`));
+        summary.filecount++;
+        const filename = originalFilename.replace(/\\/g, '/');
+        let dataname = filename.replace(/\W/g, '_');
+        if (/^\d/.test(dataname))
+            dataname = '_' + dataname;
+        let extension = node_path_1.default.extname(filename).toUpperCase();
+        if (extension.startsWith('.'))
+            extension = extension.slice(1);
+        updateExtensionGroup(filesByExtension, extension);
+        summary.size += content.length;
+        const zipContent = (0, node_zlib_1.gzipSync)(content, { level: 9 });
+        const useGzip = shouldUseGzip(content.length, zipContent.length);
+        summary.gzipsize += useGzip ? zipContent.length : content.length;
+        sources.push(createSourceEntry(filename, dataname, content, zipContent, mimeType, sha256, 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));
+    if (commandLine_1.cmdLine.maxSize !== undefined && summary.size > commandLine_1.cmdLine.maxSize) {
+        console.error((0, errorMessages_1.getSizeBudgetExceededError)('size', commandLine_1.cmdLine.maxSize, summary.size));
+        process.exit(1);
+    }
+    if (commandLine_1.cmdLine.maxGzipSize !== undefined && summary.gzipsize > commandLine_1.cmdLine.maxGzipSize) {
+        console.error((0, errorMessages_1.getSizeBudgetExceededError)('gzipSize', commandLine_1.cmdLine.maxGzipSize, summary.gzipsize));
+        process.exit(1);
+    }
+    if (commandLine_1.cmdLine.dryRun) {
+        console.log(`[DRY RUN] ${summary.filecount} files, ${formatSize(summary.size)} original size, ${formatSize(summary.gzipsize)} gzip size`);
+        console.log(`[DRY RUN] Would write to ${commandLine_1.cmdLine.outputfile}`);
+        return;
+    }
+    const cppFile = (0, cppCode_1.getCppCode)(sources, filesByExtension);
+    (0, node_fs_1.mkdirSync)(node_path_1.default.normalize(node_path_1.default.dirname(commandLine_1.cmdLine.outputfile)), { recursive: true });
+    (0, node_fs_1.writeFileSync)(commandLine_1.cmdLine.outputfile, cppFile, { flush: true, encoding: 'utf8' });
+    console.log(`${summary.filecount} files, ${formatSize(summary.size)} original size, ${formatSize(summary.gzipsize)} gzip size`);
+    console.log(`${commandLine_1.cmdLine.outputfile} ${formatSize(cppFile.length)} size`);
+    if (commandLine_1.cmdLine.engine === 'psychic' || commandLine_1.cmdLine.engine === 'espidf')
+        console.log('\n' + (0, errorMessages_1.getMaxUriHandlersHint)(commandLine_1.cmdLine.engine, sources.length, commandLine_1.cmdLine.espmethod));
 }
-const cppFile = (0, cppCode_1.getCppCode)(sources, filesByExtension);
-(0, node_fs_1.mkdirSync)(node_path_1.default.normalize(node_path_1.default.dirname(commandLine_1.cmdLine.outputfile)), { recursive: true });
-(0, node_fs_1.writeFileSync)(commandLine_1.cmdLine.outputfile, cppFile, { flush: true, encoding: 'utf8' });
-console.log(`${summary.filecount} files, ${Math.round(summary.size / 1024)}kB original size, ${Math.round(summary.gzipsize / 1024)}kB gzip size`);
-console.log(`${commandLine_1.cmdLine.outputfile} ${Math.round(cppFile.length / 1024)}kB size`);
-if (commandLine_1.cmdLine.engine === 'psychic' || commandLine_1.cmdLine.engine === 'psychic2' || commandLine_1.cmdLine.engine === 'espidf')
-    console.log('\n' + (0, errorMessages_1.getMaxUriHandlersHint)(commandLine_1.cmdLine.engine, sources.length));
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "1.16.1",
+  "version": "2.0.1",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -30,7 +30,6 @@
   "scripts": {
     "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": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
@@ -56,20 +55,21 @@
     "esp8266",
     "webserver",
     "psychichttpserver",
-    "psychichttpserverV2",
     "espasyncwebserver"
   ],
   "devDependencies": {
+    "@eslint/eslintrc": "^3.3.3",
+    "@eslint/js": "^10.0.0",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.3.0",
     "@types/picomatch": "^4.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
     "@vitest/coverage-v8": "^4.0.18",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unicorn": "^63.0.0",
     "memfs": "^4.56.10",
     "nodemon": "^3.1.11",
     "prettier": "^3.8.1",