svelteesp32 1.14.0 → 1.16.0

package/dist/commandLine.d.ts

@@ -10,6 +10,9 @@ interface ICopyFilesArguments {
     created: boolean;
     version: string;
     exclude: string[];
+    basePath: string;
+    maxSize?: number;
+    maxGzipSize?: number;
     noIndexCheck?: boolean;
     help?: boolean;
 }
@@ -25,10 +28,14 @@ interface IRcFileConfig {
     created?: boolean;
     version?: string;
     exclude?: string[];
+    basePath?: string;
+    maxSize?: number | string;
+    maxGzipSize?: number | 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 };
+export { getNpmPackageVariable, hasNpmVariables, interpolateNpmVariables, parseSize };
 export declare function formatConfiguration(cmdLine: ICopyFilesArguments): string;
 export declare const cmdLine: ICopyFilesArguments;

package/dist/commandLine.js

@@ -7,6 +7,7 @@ exports.cmdLine = void 0;
 exports.getNpmPackageVariable = getNpmPackageVariable;
 exports.hasNpmVariables = hasNpmVariables;
 exports.interpolateNpmVariables = interpolateNpmVariables;
+exports.parseSize = parseSize;
 exports.formatConfiguration = formatConfiguration;
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
@@ -34,6 +35,9 @@ Options:
   --cachetime <seconds>      max-age cache time in seconds (default: 0)
   --exclude <pattern>        Exclude files matching glob pattern (repeatable or comma-separated)
                              Examples: --exclude="*.map" --exclude="test/**/*.ts"
+  --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)
   -h, --help                 Shows this help
 
 RC File:
@@ -66,6 +70,36 @@ function validateTriState(value, name) {
         return value;
     throw new Error(`Invalid ${name}: ${value}`);
 }
+function validateBasePath(value) {
+    if (value === '')
+        return value;
+    if (!value.startsWith('/'))
+        throw new Error(`basePath must start with /: ${value}`);
+    if (value.endsWith('/'))
+        throw new Error(`basePath must not end with /: ${value}`);
+    if (value.includes('//'))
+        throw new Error(`basePath must not contain //: ${value}`);
+    return value;
+}
+function parseSize(value, name) {
+    const trimmed = value.trim();
+    const match = trimmed.match(/^(\d+(?:\.\d+)?)\s*([KMkm])?$/);
+    if (!match || !match[1])
+        throw new Error(`${name} must be a positive number with optional k/K (×1024) or m/M (×1024²) suffix: ${value}`);
+    const numericPart = Number.parseFloat(match[1]);
+    const suffix = match[2]?.toLowerCase();
+    let bytes;
+    if (suffix === 'k')
+        bytes = numericPart * 1024;
+    else if (suffix === 'm')
+        bytes = numericPart * 1024 * 1024;
+    else
+        bytes = numericPart;
+    bytes = Math.round(bytes);
+    if (bytes <= 0 || !Number.isFinite(bytes))
+        throw new Error(`${name} must be a positive integer: ${value}`);
+    return bytes;
+}
 const DEFAULT_EXCLUDE_PATTERNS = [
     '.DS_Store',
     'Thumbs.db',
@@ -136,6 +170,7 @@ function hasNpmVariables(config) {
         checkStringForNpmVariable(config.espmethod) ||
         checkStringForNpmVariable(config.define) ||
         checkStringForNpmVariable(config.version) ||
+        checkStringForNpmVariable(config.basePath) ||
         (Array.isArray(config.exclude) && config.exclude.some((pattern) => checkStringForNpmVariable(pattern))) ||
         false);
 }
@@ -155,6 +190,8 @@ function interpolateNpmVariables(config, rcFilePath) {
             affectedFields.push('espmethod');
         if (config.define?.includes('$npm_package_'))
             affectedFields.push('define');
+        if (config.basePath?.includes('$npm_package_'))
+            affectedFields.push('basePath');
         if (config.exclude)
             for (const [index, pattern] of config.exclude.entries())
                 if (pattern.includes('$npm_package_'))
@@ -179,6 +216,8 @@ function interpolateNpmVariables(config, rcFilePath) {
         result.define = interpolateString(result.define);
     if (result.version)
         result.version = interpolateString(result.version);
+    if (result.basePath)
+        result.basePath = interpolateString(result.basePath);
     if (result.exclude)
         result.exclude = result.exclude.map((pattern) => interpolateString(pattern));
     return result;
@@ -211,7 +250,10 @@ function validateRcConfig(config, rcPath) {
         'cachetime',
         'created',
         'version',
-        'exclude'
+        'exclude',
+        'basePath',
+        'maxSize',
+        'maxGzipSize'
     ]);
     for (const key of Object.keys(configObject))
         if (!validKeys.has(key))
@@ -232,6 +274,30 @@ function validateRcConfig(config, rcPath) {
             if (typeof pattern !== 'string')
                 throw new TypeError('All exclude patterns must be strings');
     }
+    if (configObject['maxSize'] !== undefined) {
+        const value = configObject['maxSize'];
+        if (typeof value === 'string')
+            try {
+                configObject['maxSize'] = parseSize(value, 'maxSize');
+            }
+            catch {
+                throw new TypeError(`Invalid maxSize in RC file: ${value} (must be a positive number with optional k/m suffix)`);
+            }
+        else if (typeof value !== 'number' || Number.isNaN(value) || value <= 0)
+            throw new TypeError(`Invalid maxSize in RC file: ${value} (must be a positive number)`);
+    }
+    if (configObject['maxGzipSize'] !== undefined) {
+        const value = configObject['maxGzipSize'];
+        if (typeof value === 'string')
+            try {
+                configObject['maxGzipSize'] = parseSize(value, 'maxGzipSize');
+            }
+            catch {
+                throw new TypeError(`Invalid maxGzipSize in RC file: ${value} (must be a positive number with optional k/m suffix)`);
+            }
+        else if (typeof value !== 'number' || Number.isNaN(value) || value <= 0)
+            throw new TypeError(`Invalid maxGzipSize in RC file: ${value} (must be a positive number)`);
+    }
     return configObject;
 }
 function parseArguments() {
@@ -264,7 +330,8 @@ function parseArguments() {
         espmethod: 'initSvelteStaticFiles',
         define: 'SVELTEESP32',
         cachetime: 0,
-        exclude: [...DEFAULT_EXCLUDE_PATTERNS]
+        exclude: [...DEFAULT_EXCLUDE_PATTERNS],
+        basePath: ''
     };
     if (rcConfig.engine)
         result.engine = rcConfig.engine;
@@ -286,6 +353,12 @@ function parseArguments() {
         result.espmethod = rcConfig.espmethod;
     if (rcConfig.define)
         result.define = rcConfig.define;
+    if (rcConfig.basePath !== undefined)
+        result.basePath = validateBasePath(rcConfig.basePath);
+    if (rcConfig.maxSize !== undefined)
+        result.maxSize = rcConfig.maxSize;
+    if (rcConfig.maxGzipSize !== undefined)
+        result.maxGzipSize = rcConfig.maxGzipSize;
     if (rcConfig.exclude && rcConfig.exclude.length > 0)
         result.exclude = [...rcConfig.exclude];
     const cliExclude = [];
@@ -342,6 +415,15 @@ function parseArguments() {
                     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}`);
             }
@@ -351,7 +433,7 @@ function parseArguments() {
             result.created = true;
             continue;
         }
-        if (argument === '--no-index-check') {
+        if (argument === '--noindexcheck') {
             result.noIndexCheck = true;
             continue;
         }
@@ -434,6 +516,18 @@ function parseArguments() {
                     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}`);
             }
@@ -466,6 +560,12 @@ function formatConfiguration(cmdLine) {
         parts.push(`espmethod=${cmdLine.espmethod}`);
     if (cmdLine.define)
         parts.push(`define=${cmdLine.define}`);
+    if (cmdLine.basePath)
+        parts.push(`basePath=${cmdLine.basePath}`);
+    if (cmdLine.maxSize !== undefined)
+        parts.push(`maxSize=${cmdLine.maxSize}`);
+    if (cmdLine.maxGzipSize !== undefined)
+        parts.push(`maxGzipSize=${cmdLine.maxGzipSize}`);
     if (cmdLine.exclude.length > 0)
         parts.push(`exclude=[${cmdLine.exclude.join(', ')}]`);
     return parts.join(' ');

package/dist/cppCode.js

@@ -108,11 +108,15 @@ struct {{definePrefix}}_FileInfo {
 // File manifest array
 const {{definePrefix}}_FileInfo {{definePrefix}}_FILES[] = {
 {{#each sources}}
-  { "/{{this.filename}}", {{this.length}}, {{this.gzipSizeForManifest}}, {{this.etagForManifest}}, "{{this.mime}}" },
+  { "{{../basePath}}/{{this.filename}}", {{this.length}}, {{this.gzipSizeForManifest}}, {{this.etagForManifest}}, "{{this.mime}}" },
 {{/each}}
 };
 const size_t {{definePrefix}}_FILE_COUNT = sizeof({{definePrefix}}_FILES) / sizeof({{definePrefix}}_FILES[0]);
 `;
+const hookSection = `
+// File served hook - override with your own implementation
+extern "C" void __attribute__((weak)) {{definePrefix}}_onFileServed(const char* path, int statusCode) {}
+`;
 const psychicTemplate = `
 //engine:   PsychicHttpServer
 //config:   {{{config}}}
@@ -137,19 +141,23 @@ ${etagArraysSection}
 //
 ${manifestSection}
 
+//
+${hookSection}
+
 //
 // Http Handlers
 void {{methodName}}(PsychicHttpServer * server) {
 {{#each sources}}
 //
 // {{this.filename}}
-  {{#if this.isDefault}}server->defaultEndpoint = {{/if}}server->on("/{{this.filename}}", HTTP_GET, [](PsychicRequest * request) {
+  {{#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}}
@@ -158,6 +166,7 @@ void {{methodName}}(PsychicHttpServer * server) {
     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
@@ -177,7 +186,7 @@ void {{methodName}}(PsychicHttpServer * server) {
   {{#if this.isGzip}}
   #ifdef {{../definePrefix}}_ENABLE_GZIP
     response.addHeader("Content-Encoding", "gzip");
-  #endif 
+  #endif
   {{/if}}
 {{/case}}
 {{/switch}}
@@ -201,7 +210,93 @@ void {{methodName}}(PsychicHttpServer * server) {
     response.addHeader("Cache-Control", "no-cache");
 {{/../cacheTime}}
     response.addHeader("ETag", etag_{{this.dataname}});
-  #endif 
+  #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}}
 
@@ -217,12 +312,14 @@ void {{methodName}}(PsychicHttpServer * server) {
     response.setContent(datagzip_{{this.dataname}}, {{this.lengthGzip}});
   #else
     response.setContent(data_{{this.dataname}}, {{this.length}});
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
+    {{../definePrefix}}_onFileServed("{{../basePath}}", 200);
     return response.send();
   });
+{{/if}}{{/if}}
 
 {{/each}}
 }`;
@@ -249,18 +346,22 @@ ${etagArraysSection}
 //
 ${manifestSection}
 
+//
+${hookSection}
+
 //
 // Http Handlers
 void {{methodName}}(PsychicHttpServer * server) {
 {{#each sources}}
 //
 // {{this.filename}}
-  {{#if this.isDefault}}server->defaultEndpoint = {{/if}}server->on("/{{this.filename}}", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {
+  {{#if this.isDefault}}{{#unless ../basePath}}server->defaultEndpoint = {{/unless}}{{/if}}server->on("{{../basePath}}/{{this.filename}}", 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}}
@@ -268,6 +369,7 @@ void {{methodName}}(PsychicHttpServer * server) {
   #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
@@ -286,7 +388,7 @@ void {{methodName}}(PsychicHttpServer * server) {
   {{#if this.isGzip}}
   #ifdef {{../definePrefix}}_ENABLE_GZIP
     response->addHeader("Content-Encoding", "gzip");
-  #endif 
+  #endif
   {{/if}}
 {{/case}}
 {{/switch}}
@@ -310,7 +412,7 @@ void {{methodName}}(PsychicHttpServer * server) {
     response->addHeader("Cache-Control", "no-cache");
 {{/../cacheTime}}
     response->addHeader("ETag", etag_{{this.dataname}});
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -326,12 +428,97 @@ void {{methodName}}(PsychicHttpServer * server) {
     response->setContent(datagzip_{{this.dataname}}, {{this.lengthGzip}});
   #else
     response->setContent(data_{{this.dataname}}, {{this.length}});
-  #endif 
+  #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, 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}}", 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}}", 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}}", 200);
+    return response->send();
+  });
+{{/if}}{{/if}}
 
 {{/each}}
 }`;
@@ -357,18 +544,22 @@ ${etagArraysSection}
 //
 ${manifestSection}
 
+//
+${hookSection}
+
 //
 // Http Handlers
 void {{methodName}}(AsyncWebServer * server) {
 {{#each sources}}
 //
 // {{this.filename}}
-  server->on("/{{this.filename}}", HTTP_GET, [](AsyncWebServerRequest * request) {
+  server->on("{{../basePath}}/{{this.filename}}", HTTP_GET, [](AsyncWebServerRequest * request) {
 
 {{#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;
     }
@@ -377,6 +568,7 @@ void {{methodName}}(AsyncWebServer * server) {
   #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;
     }
@@ -429,15 +621,17 @@ void {{methodName}}(AsyncWebServer * server) {
 {{/case}}
 {{/switch}}
 
+    {{../definePrefix}}_onFileServed("{{../basePath}}/{{this.filename}}", 200);
     request->send(response);
   });
   {{#if this.isDefault}}
-  server->on("/", HTTP_GET, [](AsyncWebServerRequest * request) {
+  server->on("{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}", HTTP_GET, [](AsyncWebServerRequest * request) {
 
 {{#switch ../etag}}
 {{#case "true"}}
     const AsyncWebHeader* h = request->getHeader("If-None-Match");
     if (h && h->value().equals(etag_{{this.dataname}})) {
+      {{../definePrefix}}_onFileServed("{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}", 304);
       request->send(304);
       return;
     }
@@ -446,6 +640,7 @@ void {{methodName}}(AsyncWebServer * server) {
   #ifdef {{../definePrefix}}_ENABLE_ETAG
     const AsyncWebHeader* h = request->getHeader("If-None-Match");
     if (h && h->value().equals(etag_{{this.dataname}})) {
+      {{../definePrefix}}_onFileServed("{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}", 304);
       request->send(304);
       return;
     }
@@ -498,6 +693,7 @@ void {{methodName}}(AsyncWebServer * server) {
 {{/case}}
 {{/switch}}
 
+    {{../definePrefix}}_onFileServed("{{#if ../basePath}}{{../basePath}}{{else}}/{{/if}}", 200);
     request->send(response);
   });
   {{/if}}
@@ -568,7 +764,8 @@ const getCppCode = (sources, filesByExtension) => {
         version: commandLine_1.cmdLine.version,
         methodName: commandLine_1.cmdLine.espmethod,
         cacheTime: commandLine_1.cmdLine.cachetime ? { value: commandLine_1.cmdLine.cachetime } : undefined,
-        definePrefix: commandLine_1.cmdLine.define
+        definePrefix: commandLine_1.cmdLine.define,
+        basePath: commandLine_1.cmdLine.basePath
     };
     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 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  { \"/{{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{{#each sources}}\n\nstatic esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)\n{\n{{#switch ../etag}}\n{{#case \"true\"}}\n    size_t hdr_len = httpd_req_get_hdr_value_len(req, \"If-None-Match\");\n    if (hdr_len > 0) {\n        char* hdr_value = malloc(hdr_len + 1);\n        if (httpd_req_get_hdr_value_str(req, \"If-None-Match\", hdr_value, hdr_len + 1) == ESP_OK) {\n            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {\n                free(hdr_value);\n                httpd_resp_set_status(req, \"304 Not Modified\");\n                httpd_resp_send(req, NULL, 0);\n                return ESP_OK;\n            }\n        }\n        free(hdr_value);\n    }\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_ETAG\n    size_t hdr_len = httpd_req_get_hdr_value_len(req, \"If-None-Match\");\n    if (hdr_len > 0) {\n        char* hdr_value = malloc(hdr_len + 1);\n        if (httpd_req_get_hdr_value_str(req, \"If-None-Match\", hdr_value, hdr_len + 1) == ESP_OK) {\n            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {\n                free(hdr_value);\n                httpd_resp_set_status(req, \"304 Not Modified\");\n                httpd_resp_send(req, NULL, 0);\n                return ESP_OK;\n            }\n        }\n        free(hdr_value);\n    }\n  #endif\n{{/case}}\n{{/switch}}\n    httpd_resp_set_type(req, \"{{this.mime}}\");\n{{#switch ../gzip}}\n{{#case \"true\"}}\n{{#if this.isGzip}}\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n{{/if}}\n{{/case}}\n{{#case \"compiler\"}}\n  {{#if this.isGzip}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n  #endif \n  {{/if}}\n{{/case}}\n{{/switch}}\n\n{{#switch ../etag}}\n{{#case \"true\"}}\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_ETAG\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n  #endif \n{{/case}}\n{{/switch}}\n\n{{#switch ../gzip}}\n{{#case \"true\"}}\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n  #else\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n  #endif \n{{/case}}\n{{/switch}}\n    return ESP_OK;\n}\n\n{{#if this.isDefault}}\nstatic const httpd_uri_t route_def_{{this.datanameUpperCase}} = {\n    .uri = \"/\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n{{/if}}\n\nstatic const httpd_uri_t route_{{this.datanameUpperCase}} = {\n    .uri = \"/{{this.filename}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n\n{{/each}}\n\n\n\nstatic inline void {{methodName}}(httpd_handle_t server) {\n{{#each sources}}\n{{#if this.isDefault}}\n    httpd_register_uri_handler(server, &route_def_{{this.datanameUpperCase}});\n{{/if}}\n    httpd_register_uri_handler(server, &route_{{this.datanameUpperCase}});\n{{/each}}\n\n}";
+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}";