@vixoniccom/module-packager 2.12.0-dev.2 → 2.12.0-dev.3

package/dist/electron.js

@@ -8,8 +8,8 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const optionDefinitions = [
     { name: 'externals', type: String, defaultValue: [], multiple: true },
-    { name: 'src', type: String, defaultValue: path.join(__dirname, 'src') },
-    { name: 'build', type: String, defaultValue: path.join(__dirname, 'build') },
+    { name: 'src', type: String, defaultValue: path.join(__dirname, './src') },
+    { name: 'build', type: String, defaultValue: path.join(__dirname, './build') },
     { name: 'config', type: String, defaultValue: './webpack.config.js' },
     { name: 'port', type: Number, defaultValue: 8080 },
     { name: 'mode', type: String, defaultValue: 'run' }
@@ -55,4 +55,7 @@ app.whenReady().then(() => {
         }
     });
 });
-app.on('window-all-closed', () => app.quit());
+app.on('window-all-closed', () => {
+    if (process.platform !== 'darwin')
+        app.quit();
+});

package/dist/launcher.html

@@ -11,6 +11,7 @@
 
   <script>
     const path = require('path')
+    const { pathToFileURL } = require('url')
     let ModuleController;
     try {
       const moduleControllerModule = require('@vixoniccom/module-controller');
@@ -48,14 +49,15 @@
           console.log('No parameters:', err.message)
         }
 
-        let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
-
-        // Add file:// to watch because in this mode the app will be in a localhost hosted environment.
-        if (options.mode === 'watch') escaped = `file://${escaped}`
-        escaped = escaped.replace(/\\/g, '/')
-
-        data.downloadsPath = escaped
+        const downloadsDir = path.join(
+          options.mode === 'watch' ? options.src : options.build,
+          'test',
+          'downloads'
+        )
 
+        data.downloadsPath = options.mode === 'watch'
+          ? pathToFileURL(downloadsDir).href
+          : downloadsDir.replace(/\\/g, '/')
 
         try {
           data.services = require(path.join(options.src, '/test/services.json')).services

package/dist/main.js

@@ -47,11 +47,12 @@ function validateOptions(options) {
 }
 // Función para sanitizar rutas
 function sanitizePath(inputPath) {
-    // Prevenir path traversal
-    if (inputPath.includes('..') || inputPath.includes('~')) {
-        throw new Error('Invalid path: path traversal detected');
+    const resolved = path.resolve(inputPath);
+    const projectRoot = path.resolve('.');
+    if (!resolved.startsWith(projectRoot + path.sep) && !resolved.startsWith(projectRoot)) {
+        throw new Error(`Invalid path outside project scope: ${inputPath}`);
     }
-    return path.resolve(inputPath);
+    return resolved;
 }
 // Función centralizada para crear argumentos de Electron
 function createElectronArgs(mode) {
@@ -65,7 +66,6 @@ function createElectronArgs(mode) {
         '--externals', Array.isArray(options.externals) ? options.externals.join(',') : ''
     ];
 }
-// Función centralizada para manejar procesos Electron
 function spawnElectronProcess(mode) {
     const args = createElectronArgs(mode);
     const nodeEnv = mode === 'run' ? 'production' : 'development';
@@ -79,8 +79,26 @@ function spawnElectronProcess(mode) {
         },
         stdio: 'inherit'
     });
-    // Manejo centralizado de logs
+    const signals = ['SIGINT', 'SIGTERM'];
+    signals.forEach((sig) => {
+        process.once(sig, () => {
+            console.log(clc.yellow(`Received ${sig}, terminating Electron process...`));
+            child.kill(sig);
+        });
+    });
     setupChildProcessLogging(child);
+    child.on('exit', (code) => {
+        if (code !== 0) {
+            console.error(clc.red(`Electron exited with code ${code}`));
+        }
+        if (mode === 'watch') {
+            process.exit(code ?? 0);
+        }
+    });
+    child.on('error', (err) => {
+        console.error(clc.red(`Failed to start Electron: ${err.message}`));
+        process.exit(1);
+    });
     return child;
 }
 // Función para manejar logging de procesos hijo
@@ -98,16 +116,16 @@ function setupChildProcessLogging(child) {
         }
     });
 }
-// Función centralizada para compilar webpack
 async function compileWebpack() {
-    // CORREGIDO: Usar __dirname para el webpack.config.js del module-packager
     const cfgPath = path.resolve(__dirname, 'webpack.config.js');
     const webpackConfigFactory = (await import(cfgPath)).default;
     const compiler = webpack(webpackConfigFactory(options));
     return new Promise((resolve, reject) => {
         compiler.run((err, stats) => {
-            if (err)
+            if (err) {
+                compiler.close(() => { });
                 return reject(err);
+            }
             if (stats?.hasErrors()) {
                 return reject(new Error(stats.toString({ all: false, errors: true, colors: true })));
             }
@@ -144,7 +162,6 @@ async function pack(callback) {
     console.log(clc.blue('Building module...'));
     validateConfiguration();
     const configPath = path.resolve(__dirname, options.config);
-    console.log("🚀 ~ pack ~ configPath:", configPath);
     try {
         const webpackConfig = (await import(configPath)).default(options);
         function handleWebpackError(err) {
@@ -193,7 +210,7 @@ async function pack(callback) {
 function installExternals(callback) {
     let externals = options.externals.map((x) => {
         // Validar nombre del paquete
-        if (!/^[@a-z0-9-_./]+$/i.test(x)) {
+        if (!/^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(x)) {
             throw new Error(`Invalid package name: ${x}`);
         }
         const packageJsonPath = sanitizePath(path.resolve(options.src, '..', 'node_modules', x, 'package.json'));
@@ -223,7 +240,6 @@ function zip() {
     console.log(clc.blue('Cleaning build...'));
     const buildPath = sanitizePath(options.build);
     const zipPath = path.resolve(buildPath, '../', 'build.zip');
-    console.log("[DEBUG] Cleaning build folder", zipPath);
     let output = fs.createWriteStream(zipPath);
     let archive = archiver('zip');
     archive.pipe(output);

package/dist/webpack.config.js

@@ -1,14 +1,10 @@
 import path from 'path';
-import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { CleanWebpackPlugin } from 'clean-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 import webpack from 'webpack';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-console.log("🚀 ~ __dirname:", __dirname);
 export default (env = {}, argv = {}) => {
     const require = createRequire(import.meta.url);
     const options = {
@@ -22,6 +18,7 @@ export default (env = {}, argv = {}) => {
     const controllerHtmlPath = path.resolve(options.src, 'index.html');
     const controllerStaticPath = path.resolve(path.dirname(controllerHtmlPath), '../static');
     const controllerFontsPath = path.resolve(path.dirname(controllerHtmlPath), '../fonts');
+    const controllerTestPath = path.resolve(options.src, 'test');
     return {
         mode: isDev ? 'development' : 'production',
         target: 'electron-renderer',
@@ -33,7 +30,7 @@ export default (env = {}, argv = {}) => {
         output: {
             path: buildPath,
             filename: '[name].js',
-            publicPath: isDev ? '/' : './'
+            publicPath: isDev ? '/' : ''
         },
         externals: {
             electron: 'commonjs electron',
@@ -79,7 +76,7 @@ export default (env = {}, argv = {}) => {
                     test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|mp4)$/,
                     type: 'asset/resource',
                     generator: {
-                        filename: '[name][ext]'
+                        filename: isDev ? '[name][ext]' : '[name].[contenthash:8][ext]'
                     }
                 },
                 {
@@ -110,12 +107,13 @@ export default (env = {}, argv = {}) => {
             new CopyWebpackPlugin({
                 patterns: [
                     { from: controllerStaticPath, to: 'static', noErrorOnMissing: true },
-                    { from: controllerFontsPath, to: 'fonts', noErrorOnMissing: true }
+                    { from: controllerFontsPath, to: 'fonts', noErrorOnMissing: true },
+                    { from: controllerTestPath, to: 'test', noErrorOnMissing: true }
                 ]
             })
         ],
         optimization: isDev ? undefined : {
-            minimize: false,
+            minimize: !isDev,
             minimizer: [
                 new TerserPlugin({
                     minify: TerserPlugin.terserMinify,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.12.0-dev.2",
+  "version": "2.12.0-dev.3",
   "type": "module",
   "license": "ISC",
   "bin": {
@@ -31,17 +31,18 @@
     "clean-webpack-plugin": "^4.0.0",
     "cli-color": "^1.2.0",
     "command-line-args": "^3.0.1",
-    "copy-webpack-plugin": "^13.0.0",
+    "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "electron": "^36.1.0",
     "electron-debug": "^3.2.0",
     "global": "^4.4.0",
     "html-loader": "^5.1.0",
-    "html-webpack-plugin": "^4.5.2",
+    "html-webpack-plugin": "^5.6.0",
     "lodash": "^4.17.21",
     "process": "^0.11.10",
     "raw-loader": "^0.5.1",
     "style-loader": "^4.0.0",
+    "terser-webpack-plugin": "^5.3.10",
     "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.8.3",