svelteesp32 3.0.2 → 3.1.1

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

@@ -7,7 +7,6 @@ exports.getFiles = void 0;
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
-const picomatch_1 = __importDefault(require("picomatch"));
 const tinyglobby_1 = require("tinyglobby");
 const consoleColor_1 = require("./consoleColor");
 const errorMessages_1 = require("./errorMessages");
@@ -38,17 +37,6 @@ const shouldSkipFile = (filename, allFilenames) => {
     }
     return false;
 };
-const isExcluded = (filename, excludePatterns) => {
-    if (excludePatterns.length === 0)
-        return false;
-    const normalizedFilename = filename.replace(/\\/g, '/');
-    const isMatch = (0, picomatch_1.default)(excludePatterns, {
-        dot: true,
-        noglobstar: false,
-        matchBase: false
-    });
-    return isMatch(normalizedFilename);
-};
 const getFiles = (options) => {
     const allFilenames = (0, tinyglobby_1.globSync)('**/*', {
         cwd: options.sourcepath,
@@ -59,13 +47,22 @@ const getFiles = (options) => {
     const withoutCompressed = allFilenames.filter((filename) => !shouldSkipFile(filename, allFilenames));
     const excludePatterns = options.exclude;
     const excludedFiles = [];
-    const filenames = withoutCompressed.filter((filename) => {
-        if (isExcluded(filename, excludePatterns)) {
-            excludedFiles.push(filename);
-            return false;
-        }
-        return true;
-    });
+    let filenames = withoutCompressed;
+    if (excludePatterns.length > 0) {
+        const allowedSet = new Set((0, tinyglobby_1.globSync)('**/*', {
+            cwd: options.sourcepath,
+            onlyFiles: true,
+            dot: false,
+            followSymbolicLinks: false,
+            ignore: excludePatterns
+        }));
+        filenames = [];
+        for (const filename of withoutCompressed)
+            if (allowedSet.has(filename))
+                filenames.push(filename);
+            else
+                excludedFiles.push(filename);
+    }
     if (excludedFiles.length > 0) {
         console.log(`\nExcluded ${excludedFiles.length} file(s):`);
         const displayLimit = 10;

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

@@ -8,11 +8,43 @@ exports.runPipeline = runPipeline;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const node_zlib_1 = require("node:zlib");
-const mime_types_1 = require("mime-types");
 const consoleColor_1 = require("./consoleColor");
 const cppCode_1 = require("./cppCode");
 const errorMessages_1 = require("./errorMessages");
 const file_1 = require("./file");
+const MIME_TYPES = {
+    html: 'text/html',
+    htm: 'text/html',
+    css: 'text/css',
+    js: 'text/javascript',
+    mjs: 'text/javascript',
+    json: 'application/json',
+    png: 'image/png',
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    gif: 'image/gif',
+    svg: 'image/svg+xml',
+    ico: 'image/x-icon',
+    webp: 'image/webp',
+    woff: 'font/woff',
+    woff2: 'font/woff2',
+    ttf: 'font/ttf',
+    otf: 'font/otf',
+    eot: 'application/vnd.ms-fontobject',
+    mp3: 'audio/mpeg',
+    wav: 'audio/wav',
+    mp4: 'video/mp4',
+    webm: 'video/webm',
+    ogg: 'audio/ogg',
+    txt: 'text/plain',
+    xml: 'application/xml',
+    pdf: 'application/pdf',
+    map: 'application/json'
+};
+const mimeLookup = (filename) => {
+    const extension = node_path_1.default.extname(filename).slice(1).toLowerCase();
+    return MIME_TYPES[extension] ?? false;
+};
 const GZIP_MIN_SIZE = 1024;
 const GZIP_MIN_REDUCTION_RATIO = 0.85;
 const shouldUseGzip = (originalSize, compressedSize) => originalSize > GZIP_MIN_SIZE && compressedSize < originalSize * GZIP_MIN_REDUCTION_RATIO;
@@ -194,7 +226,7 @@ function runPipeline(options) {
     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 rawMime = (0, mime_types_1.lookup)(originalFilename);
+        const rawMime = mimeLookup(originalFilename);
         if (!rawMime)
             console.log((0, consoleColor_1.yellowLog)(` [${originalFilename}] unknown MIME type for extension '${node_path_1.default.extname(originalFilename)}', using text/plain`));
         const mimeType = rawMime || 'text/plain';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -71,12 +71,11 @@
   ],
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.7.0",
     "@types/picomatch": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.59.2",
-    "@typescript-eslint/parser": "^8.59.2",
-    "@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 +84,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,9 +98,6 @@
     }
   },
   "dependencies": {
-    "handlebars": "^4.7.9",
-    "mime-types": "^3.0.2",
-    "picomatch": "^4.0.4",
     "tinyglobby": "^0.2.16"
   }
 }