svelteesp32 1.4.0 → 1.4.2

package/dist/consoleColor.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.redLog = exports.yellowLog = exports.greenLog = void 0;
-const greenLog = (s) => `\u001B[32m ${s} \u001B[0m`;
+const greenLog = (s) => `\u001B[32m${s}\u001B[0m`;
 exports.greenLog = greenLog;
-const yellowLog = (s) => `\u001B[33m ${s} \u001B[0m`;
+const yellowLog = (s) => `\u001B[33m${s}\u001B[0m`;
 exports.yellowLog = yellowLog;
-const redLog = (s) => `\u001B[31m ${s} \u001B[0m`;
+const redLog = (s) => `\u001B[31m${s}\u001B[0m`;
 exports.redLog = redLog;

package/dist/cppCode.js

@@ -150,10 +150,12 @@ void {{methodName}}(PsychicHttpServer * server) {
 
 {{#switch ../etag}}
 {{#case "true"}}
+    response.addHeader("cache-control", "no-cache");
     response.addHeader("ETag", etag_{{this.dataname}});
 {{/case}}
 {{#case "compiler"}}
   #ifdef {{../definePrefix}}_ENABLE_ETAG
+    response.addHeader("cache-control", "no-cache");
     response.addHeader("ETag", etag_{{this.dataname}});
   #endif 
 {{/case}}
@@ -328,10 +330,12 @@ void {{methodName}}(AsyncWebServer * server) {
 
 {{#switch ../etag}}
 {{#case "true"}}
+    response->addHeader("cache-control", "no-cache");
     response->addHeader("ETag", etag_{{this.dataname}});
 {{/case}}
 {{#case "compiler"}}
   #ifdef {{../definePrefix}}_ENABLE_ETAG
+    response->addHeader("cache-control", "no-cache");
     response->addHeader("ETag", etag_{{this.dataname}});
   #endif 
 {{/case}}

package/dist/file.d.ts

@@ -1 +1 @@
-export declare const getFiles: () => string[];
+export declare const getFiles: () => Map<string, Buffer>;

package/dist/file.js

@@ -4,23 +4,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 glob_1 = require("glob");
 const commandLine_1 = require("./commandLine");
 const consoleColor_1 = require("./consoleColor");
+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');
+        if (contentComparer.has(hash))
+            contentComparer.get(hash).push(filename);
+        else
+            contentComparer.set(hash, [filename]);
+    }
+    const result = [];
+    for (const filenames of contentComparer.values())
+        if (filenames.length > 1)
+            result.push(filenames);
+    return result;
+};
 const getFiles = () => {
-    let files = (0, glob_1.globSync)('**/*', { cwd: commandLine_1.cmdLine.sourcepath, nodir: true });
-    files = files.filter((filename) => {
+    let filenames = (0, glob_1.globSync)('**/*', { cwd: commandLine_1.cmdLine.sourcepath, nodir: true });
+    filenames = filenames.filter((filename) => {
         const extension = node_path_1.default.extname(filename);
         if (['.gz', '.brottli', '.br'].includes(extension)) {
             const original = filename.slice(0, -1 * extension.length);
-            if (files.includes(original)) {
-                console.log((0, consoleColor_1.redLog)(`${filename} skipped because is perhaps a compressed version of ${original}`));
+            if (filenames.includes(original)) {
+                console.log((0, consoleColor_1.redLog)(` ${filename} skipped because is perhaps a compressed version of ${original}`));
                 return false;
             }
         }
         return true;
     });
-    return files.sort();
+    const result = new Map();
+    for (const filename of filenames)
+        result.set(filename, (0, node_fs_1.readFileSync)(node_path_1.default.join(commandLine_1.cmdLine.sourcepath, filename), { flag: 'r' }));
+    for (const sameFile of findSimilarFiles(result))
+        console.log((0, consoleColor_1.yellowLog)(` ${sameFile.join(', ')} files look like identical`));
+    return result;
 };
 exports.getFiles = getFiles;

package/dist/index.js

@@ -19,16 +19,19 @@ const summary = {
 };
 const sources = [];
 const filesByExtension = [];
+console.log('Collecting source files');
 const files = (0, file_1.getFiles)();
-if (files.length === 0) {
+if (files.size === 0) {
     console.error(`Directory ${commandLine_1.cmdLine.sourcepath} is empty`);
     process.exit(1);
 }
-const rightPad = files.reduce((p, c) => (c.length > p ? c.length : p), 0);
-for (const file of files) {
-    const mime = (0, mime_types_1.lookup)(file) || 'text/plain';
+console.log();
+console.log('Translation to header file');
+const longestFilename = [...files.keys()].reduce((p, c) => (c.length > p ? c.length : p), 0);
+for (const [originalFilename, content] of files) {
+    const mime = (0, mime_types_1.lookup)(originalFilename) || 'text/plain';
     summary.filecount++;
-    const filename = file.replace(/\\/g, '/');
+    const filename = originalFilename.replace(/\\/g, '/');
     const dataname = filename.replace(/[./-]/g, '_');
     let extension = node_path_1.default.extname(filename).toUpperCase();
     if (extension.startsWith('.'))
@@ -38,7 +41,6 @@ for (const file of files) {
         group.count += 1;
     else
         filesByExtension.push({ extension, count: 1 });
-    const content = (0, node_fs_1.readFileSync)(node_path_1.default.join(commandLine_1.cmdLine.sourcepath, file), { flag: 'r' });
     const md5 = (0, node_crypto_1.createHash)('md5').update(content).digest('hex');
     summary.size += content.length;
     const zipContent = (0, node_zlib_1.gzipSync)(content, { level: 9 });
@@ -55,7 +57,7 @@ for (const file of files) {
             mime,
             md5
         });
-        console.log((0, consoleColor_1.greenLog)(`[${file}] ${' '.repeat(rightPad - file.length)} ✓ gzip used (${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
+        console.log((0, consoleColor_1.greenLog)(` [${originalFilename}] ${' '.repeat(longestFilename - originalFilename.length)} ✓ gzip used (${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
     }
     else {
         sources.push({
@@ -68,7 +70,7 @@ for (const file of files) {
             mime,
             md5
         });
-        console.log((0, consoleColor_1.yellowLog)(`[${file}] ${' '.repeat(rightPad - file.length)} x gzip unused ${content.length <= 1024 ? `(too small) ` : ''}(${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
+        console.log((0, consoleColor_1.yellowLog)(` [${originalFilename}] ${' '.repeat(longestFilename - originalFilename.length)} x gzip unused ${content.length <= 1024 ? `(too small) ` : ''}(${content.length} -> ${zipContent.length} = ${zipRatio}%)`));
     }
 }
 console.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -37,7 +37,8 @@
     "format:fix": "prettier --write .",
     "lint:check": "eslint .",
     "lint:fix": "eslint --fix .",
-    "fix": "npm run format:fix && npm run lint:fix"
+    "fix": "npm run format:fix && npm run lint:fix",
+    "npm:reinstall": "rm -rf ./node_modules && rm -f ./package-lock.json && npm i"
   },
   "keywords": [
     "svelte",
@@ -52,9 +53,9 @@
   ],
   "devDependencies": {
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^22.4.0",
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.1.0",
+    "@types/node": "^22.4.2",
+    "@typescript-eslint/eslint-plugin": "^8.2.0",
+    "@typescript-eslint/parser": "^8.2.0",
     "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",