svelteesp32 3.0.1 → 3.1.0

package/dist/cppCodePsychic.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genPsychicCpp = void 0;
+const cppCode_1 = require("./cppCode");
+const genPsychicHandlerBody = (d, source, path) => {
+    const lines = [];
+    const etagCheck = (0, cppCode_1.sw)(d.etag, {
+        always: [
+            `    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_${source.dataname})) {`,
+            `      response->setCode(304);`,
+            `      ${d.definePrefix}_onFileServed("${path}", 304);`,
+            `      return response->send();`,
+            `    }`
+        ].join('\n'),
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_ETAG`,
+            `    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_${source.dataname})) {`,
+            `      response->setCode(304);`,
+            `      ${d.definePrefix}_onFileServed("${path}", 304);`,
+            `      return response->send();`,
+            `    }`,
+            `  #endif`
+        ].join('\n')
+    });
+    if (etagCheck)
+        lines.push(etagCheck);
+    lines.push(`    response->setContentType("${source.mime}");`);
+    const gzipEncoding = (0, cppCode_1.sw)(d.gzip, {
+        always: source.isGzip ? `    response->addHeader("Content-Encoding", "gzip");` : '',
+        compiler: source.isGzip
+            ? [
+                `  #ifdef ${d.definePrefix}_ENABLE_GZIP`,
+                `    response->addHeader("Content-Encoding", "gzip");`,
+                `  #endif`
+            ].join('\n')
+            : ''
+    });
+    if (gzipEncoding)
+        lines.push(gzipEncoding);
+    const cacheHeaders = (0, cppCode_1.sw)(d.etag, {
+        always: [
+            `    response->addHeader("Cache-Control", "${(0, cppCode_1.cacheCtrl)(source)}");`,
+            `    response->addHeader("ETag", etag_${source.dataname});`
+        ].join('\n'),
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_ETAG`,
+            `    response->addHeader("Cache-Control", "${(0, cppCode_1.cacheCtrl)(source)}");`,
+            `    response->addHeader("ETag", etag_${source.dataname});`,
+            `  #endif`
+        ].join('\n')
+    });
+    if (cacheHeaders)
+        lines.push(cacheHeaders);
+    lines.push((0, cppCode_1.sw)(d.gzip, {
+        always: `    response->setContent(datagzip_${source.dataname}, ${source.lengthGzip});`,
+        never: `    response->setContent(data_${source.dataname}, ${source.length});`,
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_GZIP`,
+            `    response->setContent(datagzip_${source.dataname}, ${source.lengthGzip});`,
+            `  #else`,
+            `    response->setContent(data_${source.dataname}, ${source.length});`,
+            `  #endif`
+        ].join('\n')
+    }), `    ${d.definePrefix}_onFileServed("${path}", 200);`, `    return response->send();`);
+    return lines.join('\n');
+};
+const genPsychicCpp = (d) => {
+    const lines = [
+        `//engine:   PsychicHttpServer`,
+        `//config:   ${d.config}`,
+        ...(d.created ? [`//created:  ${d.now}`] : []),
+        '//',
+        (0, cppCode_1.genCommonHeader)(d),
+        '//',
+        '#include <Arduino.h>',
+        '#include <PsychicHttp.h>',
+        '#include <PsychicHttpsServer.h>',
+        '//',
+        (0, cppCode_1.genDataArrays)(d, false),
+        '//',
+        (0, cppCode_1.genEtagArrays)(d),
+        '//',
+        (0, cppCode_1.genManifest)(d),
+        '//',
+        (0, cppCode_1.genHook)(d),
+        '//',
+        '// Http Handlers',
+        `void ${d.methodName}(PsychicHttpServer * server) {`
+    ];
+    for (const source of d.sources) {
+        const path = `${d.basePath}/${source.filename}`;
+        const serverPrefix = source.isDefault && !d.basePath ? 'server->defaultEndpoint = ' : '';
+        lines.push('//', `// ${source.filename}`, `  ${serverPrefix}server->on("${path}", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {`, genPsychicHandlerBody(d, source, path), `  });`);
+        if (source.isDefault && d.basePath)
+            lines.push('//', `// ${source.filename} (base path route)`, `  server->on("${d.basePath}", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {`, genPsychicHandlerBody(d, source, d.basePath), `  });`);
+    }
+    if (d.spa && d.spaSource && d.basePath) {
+        const source = d.spaSource;
+        const path = `${d.basePath}/${source.filename}`;
+        lines.push('//', `// SPA catch-all: unmatched routes serve ${source.filename}`, `  server->on("${d.basePath}/*", HTTP_GET, [](PsychicRequest * request, PsychicResponse * response) {`, genPsychicHandlerBody(d, source, path), `  });`);
+    }
+    lines.push('}');
+    return lines.join('\n');
+};
+exports.genPsychicCpp = genPsychicCpp;

package/dist/cppCodeWebserver.d.ts

@@ -0,0 +1,2 @@
+import type { TemplateData } from './cppCode';
+export declare const genWebserverCpp: (d: TemplateData) => string;

package/dist/cppCodeWebserver.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genWebserverCpp = void 0;
+const cppCode_1 = require("./cppCode");
+const genWebserverHandlerBody = (d, source, path) => {
+    const lines = [];
+    const etagCheck = (0, cppCode_1.sw)(d.etag, {
+        always: [
+            `    if (server->hasHeader("If-None-Match") && server->header("If-None-Match").equals(etag_${source.dataname})) {`,
+            `      server->send(304);`,
+            `      ${d.definePrefix}_onFileServed("${path}", 304);`,
+            `      return;`,
+            `    }`
+        ].join('\n'),
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_ETAG`,
+            `    if (server->hasHeader("If-None-Match") && server->header("If-None-Match").equals(etag_${source.dataname})) {`,
+            `      server->send(304);`,
+            `      ${d.definePrefix}_onFileServed("${path}", 304);`,
+            `      return;`,
+            `    }`,
+            `  #endif`
+        ].join('\n')
+    });
+    if (etagCheck)
+        lines.push(etagCheck);
+    const cacheHeaders = (0, cppCode_1.sw)(d.etag, {
+        always: [
+            `    server->sendHeader("Cache-Control", "${(0, cppCode_1.cacheCtrl)(source)}");`,
+            `    server->sendHeader("ETag", etag_${source.dataname});`
+        ].join('\n'),
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_ETAG`,
+            `    server->sendHeader("Cache-Control", "${(0, cppCode_1.cacheCtrl)(source)}");`,
+            `    server->sendHeader("ETag", etag_${source.dataname});`,
+            `  #endif`
+        ].join('\n')
+    });
+    if (cacheHeaders)
+        lines.push(cacheHeaders);
+    lines.push((0, cppCode_1.sw)(d.gzip, {
+        always: [
+            ...(source.isGzip ? [`    server->sendHeader("Content-Encoding", "gzip");`] : []),
+            `    server->setContentLength(${source.lengthGzip});`,
+            `    server->send(200, "${source.mime}", "");`,
+            `    ${d.definePrefix}_sendChunked(server, datagzip_${source.dataname}, ${source.lengthGzip});`
+        ].join('\n'),
+        never: [
+            `    server->setContentLength(${source.length});`,
+            `    server->send(200, "${source.mime}", "");`,
+            `    ${d.definePrefix}_sendChunked(server, data_${source.dataname}, ${source.length});`
+        ].join('\n'),
+        compiler: [
+            `  #ifdef ${d.definePrefix}_ENABLE_GZIP`,
+            ...(source.isGzip ? [`    server->sendHeader("Content-Encoding", "gzip");`] : []),
+            `    server->setContentLength(${source.lengthGzip});`,
+            `    server->send(200, "${source.mime}", "");`,
+            `    ${d.definePrefix}_sendChunked(server, datagzip_${source.dataname}, ${source.lengthGzip});`,
+            `  #else`,
+            `    server->setContentLength(${source.length});`,
+            `    server->send(200, "${source.mime}", "");`,
+            `    ${d.definePrefix}_sendChunked(server, data_${source.dataname}, ${source.length});`,
+            `  #endif`
+        ].join('\n')
+    }), `    ${d.definePrefix}_onFileServed("${path}", 200);`);
+    return lines.join('\n');
+};
+const genWebserverCpp = (d) => {
+    const lines = [
+        `//engine:   Arduino WebServer`,
+        `//config:   ${d.config}`,
+        ...(d.created ? [`//created:  ${d.now}`] : []),
+        '//',
+        (0, cppCode_1.genCommonHeader)(d),
+        '//',
+        '#include <Arduino.h>',
+        '#include <WebServer.h>',
+        '//',
+        (0, cppCode_1.genDataArrays)(d, true),
+        '//',
+        (0, cppCode_1.genEtagArrays)(d),
+        '//',
+        (0, cppCode_1.genManifest)(d),
+        '//',
+        (0, cppCode_1.genHook)(d),
+        '//',
+        `// Chunked send helper for PROGMEM data`,
+        `static inline void ${d.definePrefix}_sendChunked(WebServer * server, const uint8_t * data, size_t len) {`,
+        `  const size_t chunkSize = 4096;`,
+        `  for (size_t offset = 0; offset < len; offset += chunkSize) {`,
+        `    size_t remaining = len - offset;`,
+        `    size_t toSend = remaining < chunkSize ? remaining : chunkSize;`,
+        `    server->sendContent_P((const char *)(data + offset), toSend);`,
+        `  }`,
+        `}`,
+        '//',
+        '// Http Handlers',
+        `void ${d.methodName}(WebServer * server) {`
+    ];
+    for (const source of d.sources) {
+        const path = `${d.basePath}/${source.filename}`;
+        const defaultPath = d.basePath || '/';
+        lines.push('//', `// ${source.filename}`, `  server->on("${path}", HTTP_GET, [server]() {`, genWebserverHandlerBody(d, source, path), `  });`);
+        if (source.isDefault)
+            lines.push(`  server->on("${defaultPath}", HTTP_GET, [server]() {`, genWebserverHandlerBody(d, source, defaultPath), `  });`);
+    }
+    if (d.spa && d.spaSource) {
+        const source = d.spaSource;
+        const path = `${d.basePath}/${source.filename}`;
+        lines.push('//', `// SPA catch-all: unmatched routes serve ${source.filename}`, `  server->onNotFound([server]() {`, `    if (server->method() != HTTP_GET) { server->send(404, "text/plain", "Not found"); return; }`);
+        if (d.basePath)
+            lines.push(`    if (!server->uri().startsWith("${d.basePath}/") && server->uri() != "${d.basePath}") { server->send(404, "text/plain", "Not found"); return; }`);
+        lines.push(genWebserverHandlerBody(d, source, path), `  });`);
+    }
+    lines.push('}');
+    return lines.join('\n');
+};
+exports.genWebserverCpp = genWebserverCpp;

package/dist/index.js

@@ -40,3 +40,5 @@ Object.defineProperty(exports, "formatSize", { enumerable: true, get: function (
 Object.defineProperty(exports, "formatSizePrecise", { enumerable: true, get: function () { return pipeline_2.formatSizePrecise; } });
 Object.defineProperty(exports, "shouldUseGzip", { enumerable: true, get: function () { return pipeline_2.shouldUseGzip; } });
 Object.defineProperty(exports, "updateExtensionGroup", { enumerable: true, get: function () { return pipeline_2.updateExtensionGroup; } });
+if (require.main === module)
+    main();

package/dist/pipeline.js

@@ -181,6 +181,8 @@ function runPipeline(options) {
     };
     const sources = [];
     const filesByExtension = [];
+    const sourceLabels = { cli: 'command line', rcfile: 'RC file', vite: 'vite plugin' };
+    console.log(`Config source: ${sourceLabels[options.configSource]}`);
     console.log('Collecting source files');
     const files = (0, file_1.getFiles)(options);
     if (files.size === 0)

package/dist/vitePlugin.d.ts

@@ -28,7 +28,6 @@ export interface SvelteESP32PluginOptions {
     noindexcheck?: boolean;
     maxsize?: number;
     maxgzipsize?: number;
-    config?: string;
 }
-export declare function svelteESP32(options: SvelteESP32PluginOptions): VitePlugin;
+export declare function svelteESP32(optionsOrRcPath?: SvelteESP32PluginOptions | string): VitePlugin;
 export {};

package/dist/vitePlugin.js

@@ -12,7 +12,7 @@ function coerceBool(value) {
         return undefined;
     return value === true || value === 'true';
 }
-function svelteESP32(options) {
+function svelteESP32(optionsOrRcPath) {
     let outDirectory = 'dist';
     return {
         name: 'svelteesp32',
@@ -20,35 +20,72 @@ function svelteESP32(options) {
             outDirectory = config.build.outDir;
         },
         closeBundle() {
-            const rcConfig = (0, commandLine_1.loadRcFileConfig)(options.config);
-            const rawOutput = options.output ?? rcConfig.outputfile;
-            if (!rawOutput)
-                throw new Error('output is required — specify it as a plugin option or in the RC file (outputfile)');
-            const outputfile = node_path_1.default.resolve(rawOutput);
-            const sourcepath = options.sourcepath ?? rcConfig.sourcepath ?? outDirectory;
-            const rawBasepath = options.basepath ?? rcConfig.basepath ?? '';
-            const basePath = (0, commandLine_1.validateBasePath)(rawBasepath);
-            const options_ = {
-                engine: options.engine ?? rcConfig.engine ?? 'psychic',
-                sourcepath,
-                outputfile,
-                etag: options.etag ?? rcConfig.etag ?? 'never',
-                gzip: options.gzip ?? rcConfig.gzip ?? 'always',
-                cachetime: options.cachetime ?? rcConfig.cachetime ?? 0,
-                cachetimeHtml: options.cachetimehtml ?? rcConfig.cachetimehtml,
-                cachetimeAssets: options.cachetimeassets ?? rcConfig.cachetimeassets,
-                created: options.created ?? coerceBool(rcConfig.created) ?? false,
-                version: options.version ?? rcConfig.version ?? '',
-                espmethod: options.espmethod ?? rcConfig.espmethod ?? 'initSvelteStaticFiles',
-                define: options.define ?? rcConfig.define ?? 'SVELTEESP32',
-                exclude: options.exclude ?? rcConfig.exclude ?? [],
-                basePath,
-                noIndexCheck: options.noindexcheck ?? coerceBool(rcConfig.noindexcheck),
-                spa: options.spa ?? coerceBool(rcConfig.spa),
-                manifest: options.manifest ?? coerceBool(rcConfig.manifest),
-                maxSize: options.maxsize ?? rcConfig.maxsize,
-                maxGzipSize: options.maxgzipsize ?? rcConfig.maxgzipsize
-            };
+            let options_;
+            if (optionsOrRcPath === undefined || typeof optionsOrRcPath === 'string') {
+                const rcPath = optionsOrRcPath;
+                const rcConfig = (0, commandLine_1.loadRcFileConfig)(rcPath);
+                const rawOutput = rcConfig.outputfile;
+                if (!rawOutput)
+                    throw new Error('output is required — specify outputfile in the RC file (.svelteesp32rc.json)');
+                const outputfile = node_path_1.default.resolve(rawOutput);
+                const sourcepath = rcConfig.sourcepath ?? outDirectory;
+                const rawBasepath = rcConfig.basepath ?? '';
+                const basePath = (0, commandLine_1.validateBasePath)(rawBasepath);
+                options_ = {
+                    configSource: 'rcfile',
+                    engine: rcConfig.engine ?? 'psychic',
+                    sourcepath,
+                    outputfile,
+                    etag: rcConfig.etag ?? 'never',
+                    gzip: rcConfig.gzip ?? 'always',
+                    cachetime: rcConfig.cachetime ?? 0,
+                    cachetimeHtml: rcConfig.cachetimehtml,
+                    cachetimeAssets: rcConfig.cachetimeassets,
+                    created: coerceBool(rcConfig.created) ?? false,
+                    version: rcConfig.version ?? '',
+                    espmethod: rcConfig.espmethod ?? 'initSvelteStaticFiles',
+                    define: rcConfig.define ?? 'SVELTEESP32',
+                    exclude: rcConfig.exclude ?? [],
+                    basePath,
+                    noIndexCheck: coerceBool(rcConfig.noindexcheck),
+                    spa: coerceBool(rcConfig.spa),
+                    manifest: coerceBool(rcConfig.manifest),
+                    maxSize: rcConfig.maxsize,
+                    maxGzipSize: rcConfig.maxgzipsize
+                };
+            }
+            else {
+                const options = optionsOrRcPath;
+                const rawOutput = options.output;
+                if (!rawOutput)
+                    throw new Error('output is required — specify it as a plugin option or use svelteESP32() for RC file mode');
+                const outputfile = node_path_1.default.resolve(rawOutput);
+                const sourcepath = options.sourcepath ?? outDirectory;
+                const rawBasepath = options.basepath ?? '';
+                const basePath = (0, commandLine_1.validateBasePath)(rawBasepath);
+                options_ = {
+                    configSource: 'vite',
+                    engine: options.engine ?? 'psychic',
+                    sourcepath,
+                    outputfile,
+                    etag: options.etag ?? 'never',
+                    gzip: options.gzip ?? 'always',
+                    cachetime: options.cachetime ?? 0,
+                    cachetimeHtml: options.cachetimehtml,
+                    cachetimeAssets: options.cachetimeassets,
+                    created: options.created ?? false,
+                    version: options.version ?? '',
+                    espmethod: options.espmethod ?? 'initSvelteStaticFiles',
+                    define: options.define ?? 'SVELTEESP32',
+                    exclude: options.exclude ?? [],
+                    basePath,
+                    noIndexCheck: options.noindexcheck,
+                    spa: options.spa,
+                    manifest: options.manifest,
+                    maxSize: options.maxsize,
+                    maxGzipSize: options.maxgzipsize
+                };
+            }
             (0, pipeline_1.runPipeline)(options_);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -72,11 +72,11 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.6.2",
     "@types/picomatch": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.59.1",
-    "@typescript-eslint/parser": "^8.59.1",
-    "@vitest/coverage-v8": "^4.1.5",
+    "@typescript-eslint/eslint-plugin": "^8.59.3",
+    "@typescript-eslint/parser": "^8.59.3",
+    "@vitest/coverage-v8": "^4.1.6",
     "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^13.0.0",
@@ -85,9 +85,10 @@
     "memfs": "^4.57.2",
     "nodemon": "^3.1.14",
     "prettier": "^3.8.3",
+    "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.5"
+    "vitest": "^4.1.6"
   },
   "peerDependencies": {
     "vite": ">=5"
@@ -98,7 +99,6 @@
     }
   },
   "dependencies": {
-    "handlebars": "^4.7.9",
     "mime-types": "^3.0.2",
     "picomatch": "^4.0.4",
     "tinyglobby": "^0.2.16"