cc4-embedded-system 3.1.10 → 3.2.1

package/dist/gui.js

@@ -1,302 +1,71 @@
 #!/usr/bin/env node
-/*
- * ==============================================================================
- * CC4EmbeddedSystem V3 (makefsdata)
- * Copyright (c) 2026 LunaticGhoulPiano / Emile Su
- * Licensed under the MIT License.
- * ==============================================================================
- *
- * This software integrates concepts, logic, and minification processes derived
- * from the following open-source projects. We deeply appreciate their work:
- *
- * ------------------------------------------------------------------------------
- * 1. lwIP (Lightweight TCP/IP stack)
- * Repository: https://github.com/m-labs/lwip
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * All rights reserved.
- * * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * ------------------------------------------------------------------------------
- * 2. html-minifier-next
- * Repository: https://github.com/j9t/html-minifier-next
- * Copyright (c) Jens Oliver Meiert (html-minifier-next)
- * Copyright (c) Daniel Ruf (html-minifier-terser)
- * Copyright (c) Juriy "kangax" Zaytsev (html-minifier)
- * * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ==============================================================================
- */
-import express from 'express';
-import open from 'open';
-import fs from 'node:fs';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { CliUsageError, getHelpText, parseCliArguments } from './cli.js';
+import { getConfigFilePath, getLastBuildPaths, getLastGzipOptions, saveLastBuildPaths } from './config.js';
+import { DEFAULT_GZIP_LEVEL } from './gzip-options.js';
 import { runMakeFsData } from './makefsdata.js';
+import { startGuiServer } from './server.js';
 import { getPackageVersion } from './utils.js';
-import { execFile } from 'node:child_process';
-import os from 'node:os';
-// prevent socket errors
-process.on('uncaughtException', (err) => {
-    if (err.code === 'EADDRINUSE')
-        return;
-    console.error('⚠️ Uncaught Error:', err);
-});
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const app = express();
-// port set by command
-let PORT = parseInt(process.env.PORT || '3000', 10);
-const portArgIndex = process.argv.indexOf('--port');
-if (portArgIndex !== -1 && process.argv[portArgIndex + 1]) {
-    const parsedPort = parseInt(process.argv[portArgIndex + 1], 10);
-    if (!isNaN(parsedPort))
-        PORT = parsedPort;
-}
-let activeBrowseProcess = null;
-let server;
-let shutdownTimer = null;
-app.use(express.json());
-const publicPath = fs.existsSync(path.join(__dirname, 'public'))
-    ? path.join(__dirname, 'public')
-    : path.join(__dirname, '../public');
-console.log(`[System] Serving static files from: ${publicPath}`);
-app.use(express.static(publicPath));
-const cancelShutdown = () => {
-    if (shutdownTimer) {
-        clearTimeout(shutdownTimer);
-        shutdownTimer = null;
-        // console.log('🛡️ Shutdown cancelled (keep alive)');
-    }
-};
-const scheduleShutdown = () => {
-    if (!shutdownTimer) {
-        shutdownTimer = setTimeout(() => {
-            closeBrowseProcess();
-            console.log('👋 Window closed, shutting down ...');
-            process.exit(0);
-        }, 2000);
-    }
+const getDefaultGuiPort = () => {
+    const configuredPort = Number.parseInt(process.env.PORT ?? '3000', 10);
+    if (configuredPort < 1 || configuredPort > 65535 || Number.isNaN(configuredPort))
+        return 3000;
+    return configuredPort;
 };
-const buildPowerShellArgs = (script) => {
-    const encodedCommand = Buffer.from(script, 'utf16le').toString('base64');
-    return [
-        '-NoProfile',
-        '-STA',
-        '-EncodedCommand',
-        encodedCommand
-    ];
-};
-const closeBrowseProcess = () => {
-    if (activeBrowseProcess && !activeBrowseProcess.killed) {
-        try {
-            activeBrowseProcess.kill();
-        }
-        catch (e) {
-            // ignore child cleanup error
-        }
+const runHeadlessBuild = async (inputPath, outputPath, minifyOpts, optimizeSvg, svgoMultipass, gzipOverride, gzipLevelOverride) => {
+    const lastBuild = getLastBuildPaths();
+    const lastGzipOptions = getLastGzipOptions();
+    const selectedInputPath = inputPath ?? lastBuild?.src;
+    const selectedOutputPath = outputPath ?? lastBuild?.dst ?? 'fsdata.c';
+    const gzipOptions = {
+        gzip: gzipOverride ?? lastGzipOptions?.gzip ?? false,
+        gzipLevel: gzipLevelOverride ?? lastGzipOptions?.gzipLevel ?? DEFAULT_GZIP_LEVEL
+    };
+    if (!selectedInputPath) {
+        throw new CliUsageError('Headless mode requires --src, or a source path saved by a previous successful build.');
     }
-    activeBrowseProcess = null;
-};
-const runDialogCommand = (command, args) => {
-    return new Promise((resolve, reject) => {
-        const child = execFile(command, args, {
-            windowsHide: false,
-            maxBuffer: 1024 * 1024
-        }, (error, stdout, stderr) => {
-            if (activeBrowseProcess === child)
-                activeBrowseProcess = null;
-            if (error) {
-                reject(new Error(stderr.trim() || error.message));
-                return;
-            }
-            resolve(stdout.trim());
-        });
-        activeBrowseProcess = child;
-    });
-};
-const buildWindowsDialogScript = (dialogLines) => {
-    return [
-        'Add-Type -AssemblyName System.Windows.Forms',
-        'Add-Type -AssemblyName System.Drawing',
-        '$screen = [System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea',
-        '$owner = New-Object System.Windows.Forms.Form',
-        '$owner.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual',
-        '$owner.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::None',
-        '$owner.ShowInTaskbar = $false',
-        '$owner.TopMost = $true',
-        '$owner.Width = 1',
-        '$owner.Height = 1',
-        '$owner.Left = $screen.Left + [int]($screen.Width / 2)',
-        '$owner.Top = $screen.Top + [int]($screen.Height / 2)',
-        '$owner.Opacity = 0',
-        '$null = $owner.Show()',
-        '$null = $owner.Activate()',
-        '$owner.BringToFront()',
-        '[System.Windows.Forms.Application]::DoEvents()',
-        ...dialogLines,
-        '$owner.Close()',
-        '$owner.Dispose()'
-    ].join('\n');
-};
-app.get('/api/version', (_req, res) => {
-    cancelShutdown();
-    res.json({ version: getPackageVersion() });
-});
-app.post('/api/shutdown', (_req, res) => {
-    res.json({ success: true });
-    closeBrowseProcess();
-    scheduleShutdown();
-});
-app.post('/api/cancel-shutdown', (_req, res) => {
-    cancelShutdown();
-    res.json({ success: true });
-});
-app.post('/api/build', async (req, res) => {
-    cancelShutdown();
-    const { inputPath, outputPath, minifyOpts } = req.body;
-    console.log(`[Build] Input: ${inputPath}`);
-    console.log(`[Build] Output: ${outputPath}`);
     const opts = {
-        inputDir: inputPath,
-        outputFile: outputPath,
+        inputDir: path.resolve(selectedInputPath),
+        outputFile: path.resolve(selectedOutputPath),
         processSubs: true,
         includeHttpHeader: true,
         useHttp11: false,
         supportSsi: true,
         precalcChksum: false,
-        minifyOpts: minifyOpts
+        minifyOpts,
+        optimizeSvg,
+        svgoMultipass,
+        ...gzipOptions
     };
+    const stats = await runMakeFsData(opts);
+    saveLastBuildPaths(opts.inputDir, opts.outputFile, gzipOptions);
+    console.log(`✨ Build complete: ${stats.filesCount} file(s), ${stats.originalSize} -> ${stats.compressedSize} -> ${stats.storedSize} bytes (${stats.gzipFilesCount} gzip file(s)).`);
+};
+const main = async () => {
     try {
-        // get stats
-        const stats = await runMakeFsData(opts);
-        try {
-            await open(path.dirname(path.resolve(outputPath)));
-        }
-        catch (e) {
-            // ignore open folder error
-        }
-        // return stats
-        res.json({
-            success: true,
-            stats: stats // originalSize, compressedSize, filesCount
-        });
-    }
-    catch (error) {
-        res.json({ success: false, message: error.message });
-    }
-});
-app.post('/api/change-port', (req, res) => {
-    cancelShutdown();
-    const parsedPort = parseInt(req.body.newPort, 10);
-    if (isNaN(parsedPort) || parsedPort < 1 || parsedPort > 65535) {
-        res.json({ success: false, message: 'Invalid port number.' });
-        return;
-    }
-    res.json({ success: true });
-    setTimeout(() => {
-        if (server) {
-            try {
-                server.closeAllConnections();
-                server.close(() => {
-                    PORT = parsedPort;
-                    startServer();
-                    console.log(`🔄 Server successfully restarted on port ${PORT}`);
-                });
-            }
-            catch (e) {
-                startServer();
-            }
+        const args = parseCliArguments(process.argv.slice(2));
+        if (args.showHelp) {
+            console.log(getHelpText());
+            return;
         }
-    }, 100);
-});
-app.get('/api/browse', async (req, res) => {
-    cancelShutdown();
-    res.on('close', () => {
-        if (!res.writableEnded) {
-            closeBrowseProcess();
-            scheduleShutdown();
+        if (args.showVersion) {
+            console.log(getPackageVersion());
+            return;
         }
-    });
-    const isDir = req.query.type === 'dir';
-    const platform = os.platform();
-    try {
-        let result = '';
-        if (platform === 'win32') {
-            const script = isDir
-                ? buildWindowsDialogScript([
-                    '$dialog = New-Object System.Windows.Forms.FolderBrowserDialog',
-                    '$dialog.Description = "Select Input Directory"',
-                    'if ($dialog.ShowDialog($owner) -eq [System.Windows.Forms.DialogResult]::OK) {',
-                    '    $dialog.SelectedPath',
-                    '}'
-                ])
-                : buildWindowsDialogScript([
-                    '$dialog = New-Object System.Windows.Forms.SaveFileDialog',
-                    '$dialog.Filter = "C Files (*.c)|*.c|All Files (*.*)|*.*"',
-                    '$dialog.DefaultExt = "c"',
-                    '$dialog.AddExtension = $true',
-                    '$dialog.OverwritePrompt = $true',
-                    'if ($dialog.ShowDialog($owner) -eq [System.Windows.Forms.DialogResult]::OK) {',
-                    '    $dialog.FileName',
-                    '}'
-                ]);
-            result = await runDialogCommand('powershell.exe', buildPowerShellArgs(script));
+        if (args.showConfigPath) {
+            console.log(getConfigFilePath());
+            return;
         }
-        else if (platform === 'darwin') {
-            result = await runDialogCommand('osascript', [
-                '-e',
-                isDir
-                    ? 'POSIX path of (choose folder with prompt "Select Input Directory")'
-                    : 'POSIX path of (choose file name with prompt "Select Output File")'
-            ]);
+        if (args.headless) {
+            await runHeadlessBuild(args.inputPath, args.outputPath, args.minifyOpts, args.optimizeSvg, args.svgoMultipass, args.gzip, args.gzipLevel);
+            return;
         }
-        else {
-            result = await runDialogCommand('zenity', isDir
-                ? ['--file-selection', '--directory', '--title=Select Input Directory']
-                : ['--file-selection', '--save', '--confirm-overwrite', '--title=Select Output File', '--filename=fsdata.c']);
-        }
-        res.json({ success: true, path: result || null });
+        startGuiServer(args.port ?? getDefaultGuiPort());
     }
-    catch (e) {
-        res.json({ success: true, path: null });
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`❌ ${message}`);
+        process.exitCode = 1;
     }
-});
-const startServer = () => {
-    server = app.listen(PORT, () => {
-        console.log(`✨ GUI Server started on http://localhost:${PORT}`);
-    });
 };
-// main run
-startServer();
-open(`http://localhost:${PORT}`);
+void main();

package/dist/gzip-options.js

@@ -0,0 +1,10 @@
+export const DEFAULT_GZIP_LEVEL = 9;
+export const isGzipLevel = (value) => {
+    return typeof value === 'number' && Number.isInteger(value) && value >= 1 && value <= 9;
+};
+export const getDefaultGzipBuildOptions = () => {
+    return {
+        gzip: false,
+        gzipLevel: DEFAULT_GZIP_LEVEL
+    };
+};

package/dist/makefsdata.js

@@ -59,23 +59,23 @@
 // modern ESM
 import fs from 'node:fs';
 import path from 'node:path';
+import { gzipSync } from 'node:zlib';
+import { transform as transformJavaScript } from 'esbuild';
 import { minify } from 'html-minifier-next';
+import { transform as transformCss } from 'lightningcss';
+import { optimize } from 'svgo';
+import { DEFAULT_GZIP_LEVEL, isGzipLevel } from './gzip-options.js';
 import { getPackageVersion } from './utils.js';
+import { DEFAULT_HTML_MINIFY_OPTIONS } from './minify-options.js';
 // ----------------------------------------------------------------------
 // 1. Configs & Version Recovery
 // ----------------------------------------------------------------------
 const TCP_MSS = 1460;
 const LWIP_VERSION = "1.3.1"; // this makefsdata.ts is based on lwIP v1.3.1
-// html-minifier-next options
-const COMPRESS_OPTS_DEFAULT = {
-    collapseWhitespace: true,
-    removeComments: true,
-    minifyJS: true,
-    minifyCSS: true,
-    processConditionalComments: true,
-    decodeEntities: true
-};
 const REDIRHOME_PATH = '/redirhome.html';
+const GZIP_CANDIDATE_EXTENSIONS = new Set([
+    '.html', '.htm', '.css', '.js', '.mjs', '.json', '.svg', '.xml', '.txt', '.map'
+]);
 // ----------------------------------------------------------------------
 // 3. lwIP Helpers
 // ----------------------------------------------------------------------
@@ -92,6 +92,7 @@ function getMimeType(fileName) {
         case '.css':
             return 'text/css';
         case '.js':
+        case '.mjs':
             return 'application/javascript';
         case '.png':
             return 'image/png';
@@ -106,7 +107,10 @@ function getMimeType(fileName) {
         case '.xml':
             return 'text/xml';
         case '.json':
+        case '.map':
             return 'application/json';
+        case '.svg':
+            return 'image/svg+xml';
         default:
             return 'text/plain';
     }
@@ -124,7 +128,7 @@ function inetChksum(buf) {
         sum = (sum & 0xFFFF) + (sum >> 16);
     return (~sum) & 0xFFFF;
 }
-function generateHttpHeaders(fileName, dataLength, opts) {
+function generateHttpHeaders(fileName, dataLength, opts, contentEncoding) {
     const parts = [];
     const ccVersion = getPackageVersion();
     const addPart = (str) => { parts.push({ str, buf: Buffer.from(str, 'ascii') }); };
@@ -154,21 +158,29 @@ function generateHttpHeaders(fileName, dataLength, opts) {
         else
             addPart(`Connection: close\r\n`);
     }
-    addPart(`Content-type: ${getMimeType(fileName)}\r\n\r\n`);
+    if (contentEncoding === 'gzip') {
+        addPart(`Content-type: ${getMimeType(fileName)}\r\n`);
+        addPart('Content-Encoding: gzip\r\n');
+        addPart('\r\n');
+    }
+    else
+        addPart(`Content-type: ${getMimeType(fileName)}\r\n\r\n`);
     return { parts, totalBuffer: Buffer.concat(parts.map(p => p.buf)) };
 }
-function getFilesRecursive(dir, processSubs) {
+function getFilesRecursive(dir, processSubs, sortEntries) {
     const results = [];
     if (!fs.existsSync(dir))
         return results;
     const list = fs.readdirSync(dir);
+    if (sortEntries)
+        list.sort();
     for (const file of list) {
         const fullPath = path.join(dir, file);
         const stat = fs.statSync(fullPath);
         if (!stat.isDirectory())
             results.push(fullPath);
         else if (processSubs)
-            results.push(...getFilesRecursive(fullPath, processSubs));
+            results.push(...getFilesRecursive(fullPath, processSubs, sortEntries));
     }
     return results;
 }
@@ -188,28 +200,106 @@ function bufferToHexCArray(buf) {
         out += '\n';
     return out;
 }
+function gzipDeterministic(content, gzipLevel) {
+    const compressed = gzipSync(content, { level: gzipLevel });
+    // RFC 1952 mtime and OS fields: avoid build-time and host-specific metadata.
+    compressed.fill(0, 4, 8);
+    compressed[9] = 0xff;
+    return compressed;
+}
+async function optimizeContent(filePath, relativePath, content, minifyOpts, opts) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (ext === '.svg' && opts.optimizeSvg !== false) {
+        try {
+            const optimizedSvg = optimize(content.toString('utf8'), {
+                path: filePath,
+                multipass: opts.svgoMultipass ?? false
+            });
+            const optimizedContent = Buffer.from(optimizedSvg.data, 'utf8');
+            console.log(`🖼️ Optimized SVG: ${relativePath} (${content.length} -> ${optimizedContent.length} bytes)`);
+            return optimizedContent;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to optimize SVG ${relativePath}: ${message}`);
+        }
+    }
+    if (['.html', '.htm'].includes(ext)) {
+        const minifiedHtml = await minify(content.toString('utf8'), minifyOpts);
+        if (typeof minifiedHtml === 'string') {
+            const optimizedContent = Buffer.from(minifiedHtml, 'utf8');
+            console.log(`📦 Minified HTML: ${relativePath} (${content.length} -> ${optimizedContent.length} bytes)`);
+            return optimizedContent;
+        }
+    }
+    if (ext === '.css' && minifyOpts.minifyCSS) {
+        try {
+            const optimizedCss = transformCss({
+                filename: filePath,
+                code: content,
+                minify: true
+            });
+            const optimizedContent = Buffer.from(optimizedCss.code);
+            console.log(`🎨 Minified CSS: ${relativePath} (${content.length} -> ${optimizedContent.length} bytes)`);
+            return optimizedContent;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to minify CSS ${relativePath}: ${message}`);
+        }
+    }
+    if (['.js', '.mjs'].includes(ext) && minifyOpts.minifyJS) {
+        try {
+            const optimizedJs = await transformJavaScript(content.toString('utf8'), {
+                loader: 'js',
+                minify: true,
+                legalComments: 'none',
+                sourcefile: filePath
+            });
+            const optimizedContent = Buffer.from(optimizedJs.code, 'utf8');
+            console.log(`📦 Minified JavaScript: ${relativePath} (${content.length} -> ${optimizedContent.length} bytes)`);
+            return optimizedContent;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to minify JavaScript ${relativePath}: ${message}`);
+        }
+    }
+    console.log(`📄 Copied: ${relativePath}`);
+    return content;
+}
 export async function runMakeFsData(opts) {
     console.log(`🚀 CC4EmbeddedSystem V3: Starting makefsdata compilation...`);
-    // checkers
+    // Check source directory before making any output directory changes.
     if (!fs.existsSync(opts.inputDir)) {
-        console.log(`⚠️ Input directory not found. Auto-creating directory: \n${opts.inputDir}`);
-        fs.mkdirSync(opts.inputDir, { recursive: true });
+        throw new Error(`Input directory not found: ${path.resolve(opts.inputDir)}`);
+    }
+    if (!fs.statSync(opts.inputDir).isDirectory())
+        throw new Error(`Input path is not a directory: ${path.resolve(opts.inputDir)}`);
+    if (fs.existsSync(opts.outputFile) && fs.statSync(opts.outputFile).isDirectory()) {
+        opts.outputFile = path.join(opts.outputFile, 'fsdata.c');
+        console.log(`🔧 Output directory selected. Using default file -> ${opts.outputFile}`);
     }
-    if (!opts.outputFile.toLowerCase().endsWith('.c')) {
+    else if (!opts.outputFile.toLowerCase().endsWith('.c')) {
         opts.outputFile += '.c';
         console.log(`🔧 Auto-appended '.c' to output file -> ${opts.outputFile}`);
     }
     const outDir = path.dirname(opts.outputFile);
     if (!fs.existsSync(outDir))
         fs.mkdirSync(outDir, { recursive: true });
-    const allFiles = getFilesRecursive(opts.inputDir, opts.processSubs);
+    const gzipEnabled = opts.gzip ?? false;
+    const gzipLevel = opts.gzipLevel ?? DEFAULT_GZIP_LEVEL;
+    if (!isGzipLevel(gzipLevel))
+        throw new Error('gzipLevel must be an integer from 1 to 9.');
+    const allFiles = getFilesRecursive(opts.inputDir, opts.processSubs, gzipEnabled);
     const fileEntries = [];
     let totalOriginalSize = 0;
     let totalCompressedSize = 0;
+    let totalStoredSize = 0;
+    let gzipFilesCount = 0;
     if (allFiles.length === 0)
         throw new Error(`Input directory is empty! Please put your web files (.html, .css, etc.) into:\n${path.resolve(opts.inputDir)}`);
-    // html-minifier-next options
-    const activeCompressOpts = opts.minifyOpts || COMPRESS_OPTS_DEFAULT;
+    const activeCompressOpts = opts.minifyOpts ?? DEFAULT_HTML_MINIFY_OPTIONS;
     for (let i = 0; i < allFiles.length; i++) {
         const filePath = allFiles[i];
         const relativePath = '/' + path.relative(opts.inputDir, filePath).replace(/\\/g, '/');
@@ -217,18 +307,29 @@ export async function runMakeFsData(opts) {
         let content = fs.readFileSync(filePath);
         const originalFileSize = content.length;
         totalOriginalSize += originalFileSize;
-        if (['.html', '.htm', '.css', '.js'].includes(ext)) {
-            const minifiedStr = await minify(content.toString('utf8'), activeCompressOpts);
-            if (typeof minifiedStr === 'string') {
-                content = Buffer.from(minifiedStr, 'utf8');
-                console.log(`📦 Minified: ${relativePath} (${originalFileSize} -> ${content.length} bytes)`);
+        content = await optimizeContent(filePath, relativePath, content, activeCompressOpts, opts);
+        const rawContentLength = content.length;
+        totalCompressedSize += rawContentLength;
+        let contentEncoding;
+        let compressionNote;
+        if (gzipEnabled && GZIP_CANDIDATE_EXTENSIONS.has(ext)) {
+            const gzipContent = gzipDeterministic(content, gzipLevel);
+            if (gzipContent.length < content.length) {
+                content = gzipContent;
+                contentEncoding = 'gzip';
+                gzipFilesCount++;
+                const savedSize = rawContentLength - content.length;
+                const savedPercent = ((savedSize / rawContentLength) * 100).toFixed(1);
+                compressionNote = `gzip level ${gzipLevel}, original ${rawContentLength} B, stored ${content.length} B, saved ${savedSize} B (${savedPercent}%)`;
             }
+            else
+                compressionNote = `raw, original ${rawContentLength} B, gzip was not smaller`;
         }
-        else
-            console.log(`📄 Copied: ${relativePath}`);
-        totalCompressedSize += content.length;
+        else if (gzipEnabled)
+            compressionNote = 'raw, not a gzip candidate';
+        totalStoredSize += content.length;
         // generate header
-        const headerData = opts.includeHttpHeader ? generateHttpHeaders(filePath, content.length, opts) : { parts: [], totalBuffer: Buffer.alloc(0) };
+        const headerData = opts.includeHttpHeader ? generateHttpHeaders(filePath, content.length, opts, contentEncoding) : { parts: [], totalBuffer: Buffer.alloc(0) };
         const nameBuffer = Buffer.from(relativePath + '\0', 'utf8');
         const varName = relativePath.replace(/[^A-Za-z0-9]/g, '_');
         const chksums = [];
@@ -244,7 +345,21 @@ export async function runMakeFsData(opts) {
                 offset += chunkLen;
             }
         }
-        fileEntries.push({ varName, pathName: relativePath, nameBuffer, headerParts: headerData.parts, headerTotalBuffer: headerData.totalBuffer, contentBuffer: content, chksums });
+        const fileEntry = {
+            varName,
+            pathName: relativePath,
+            nameBuffer,
+            headerParts: headerData.parts,
+            headerTotalBuffer: headerData.totalBuffer,
+            contentBuffer: content,
+            chksums,
+            rawContentLength
+        };
+        if (contentEncoding)
+            fileEntry.contentEncoding = contentEncoding;
+        if (compressionNote)
+            fileEntry.compressionNote = compressionNote;
+        fileEntries.push(fileEntry);
     }
     // find real redirhome.html
     const redirhomeIndex = fileEntries.findIndex(file => file.pathName.toLowerCase() === REDIRHOME_PATH);
@@ -272,6 +387,8 @@ export async function runMakeFsData(opts) {
     }
     // generate data arrays
     for (const file of orderedFileEntries) {
+        if (file.compressionNote)
+            cOutput += `/* ${file.pathName}: ${file.compressionNote} */\n`;
         cOutput += `static const unsigned int dummy_align_${file.varName} = 0;\n`;
         cOutput += `static const unsigned char data_${file.varName}[] = {\n`;
         cOutput += `\t/* ${file.pathName} (${file.nameBuffer.length} chars) */\n`;
@@ -286,7 +403,8 @@ export async function runMakeFsData(opts) {
                 cOutput += bufferToHexCArray(part.buf);
             }
         }
-        cOutput += `\n\t/* raw file data (${file.contentBuffer.length} bytes) */\n`;
+        const contentDescription = file.contentEncoding === 'gzip' ? 'gzip file data' : 'raw file data';
+        cOutput += `\n\t/* ${contentDescription} (${file.contentBuffer.length} bytes) */\n`;
         cOutput += bufferToHexCArray(file.contentBuffer);
         cOutput += `};\n\n\n\n`;
     }
@@ -327,8 +445,10 @@ export async function runMakeFsData(opts) {
         return {
             originalSize: totalOriginalSize,
             compressedSize: totalCompressedSize,
+            storedSize: totalStoredSize,
             convertedSize: convertedSize,
-            filesCount: orderedFileEntries.length
+            filesCount: orderedFileEntries.length,
+            gzipFilesCount
         };
     }
     throw new Error("No files processed.");