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

package/dist/electron.js

@@ -8,11 +8,11 @@ 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' }
+    { name: 'mode', type: String, defaultValue: 'build' }
 ];
 const options = commandLineArgs(optionDefinitions);
 if (options.mode === 'watch') {
@@ -55,7 +55,4 @@ app.whenReady().then(() => {
         }
     });
 });
-app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin')
-        app.quit();
-});
+app.on('window-all-closed', () => app.quit());

package/dist/launcher.html

@@ -7,11 +7,11 @@
 </head>
 
 <body style="width: 100%; height: 100%; margin: 0; padding: 0;">
-  <webview id="webview" style="width: 100%; height: 100%;" partition="persist:webview"></webview>
+  <!-- Remover el webview del HTML -->
+  <div id="webview-container" style="width: 100%; height: 100%;"></div>
 
   <script>
     const path = require('path')
-    const { pathToFileURL } = require('url')
     let ModuleController;
     try {
       const moduleControllerModule = require('@vixoniccom/module-controller');
@@ -23,11 +23,17 @@
     const remote = require('@electron/remote')
 
     ipcRenderer.on('init', (event, options) => {
-      const webview = document.getElementById('webview')
-      const win = remote.getCurrentWindow()
-
+      // Crear el webview dinámicamente
+      const webview = document.createElement('webview')
+      webview.id = 'webview'
+      webview.style.width = '100%'
+      webview.style.height = '100%'
+      webview.setAttribute('partition', 'persist:webview')
+      
       webview.setAttribute('nodeintegration', '')
       webview.setAttribute('webpreferences', 'webSecurity=false, allowRunningInsecureContent=true, nodeIntegration=yes, contextIsolation=no')
+      
+      const win = remote.getCurrentWindow()
 
       webview.addEventListener('did-finish-load', () => {
         win.show()
@@ -40,27 +46,29 @@
 
       webview.src = resolvedSrc
 
+      // Añadir el webview al DOM después de configurarlo
+      document.getElementById('webview-container').appendChild(webview)
+
       function getData() {
         const data = {}
 
         try {
-          data.parameters = require(path.join(options.src, '/test/parameters.json')).parameters
+          data.parameters = require(path.join(options.src, 'test', 'parameters.json')).parameters
         } catch (err) {
           console.log('No parameters:', err.message)
         }
 
-        const downloadsDir = path.join(
-          options.mode === 'watch' ? options.src : options.build,
-          'test',
-          'downloads'
-        )
+        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
 
-        data.downloadsPath = options.mode === 'watch'
-          ? pathToFileURL(downloadsDir).href
-          : downloadsDir.replace(/\\/g, '/')
 
         try {
-          data.services = require(path.join(options.src, '/test/services.json')).services
+          data.services = require(path.join(options.src, 'test','services.json')).services
         } catch (err) {
           console.log('No services:', err.message)
         }

package/dist/main.js

@@ -16,7 +16,14 @@ import which from 'which';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const electronPath = path.join(__dirname, 'electron.js');
-const npxPath = which.sync('npx');
+let npxPath;
+try {
+    npxPath = which.sync('npx');
+}
+catch (error) {
+    console.log(error);
+    console.error('Error: npx is not installed or not found in PATH.');
+}
 const optionDefinitions = [
     { name: 'externals', type: String, defaultValue: [], multiple: true },
     { name: 'target', type: String, defaultValue: 'web' },
@@ -47,12 +54,11 @@ function validateOptions(options) {
 }
 // Función para sanitizar rutas
 function sanitizePath(inputPath) {
-    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}`);
+    // Prevenir path traversal
+    if (inputPath.includes('..') || inputPath.includes('~')) {
+        throw new Error('Invalid path: path traversal detected');
     }
-    return resolved;
+    return path.resolve(inputPath);
 }
 // Función centralizada para crear argumentos de Electron
 function createElectronArgs(mode) {
@@ -63,9 +69,10 @@ function createElectronArgs(mode) {
         '--port', String(options.port),
         '--mode', mode,
         '--config', options.config,
-        '--externals', Array.isArray(options.externals) ? options.externals.join(',') : ''
+        ...options.externals.flatMap((pkg) => ['--externals', pkg])
     ];
 }
+// Función centralizada para manejar procesos Electron
 function spawnElectronProcess(mode) {
     const args = createElectronArgs(mode);
     const nodeEnv = mode === 'run' ? 'production' : 'development';
@@ -77,28 +84,10 @@ function spawnElectronProcess(mode) {
             ELECTRON_DISABLE_SECURITY_WARNINGS: 'true',
             NODE_NO_WARNINGS: '1'
         },
-        stdio: 'inherit'
-    });
-    const signals = ['SIGINT', 'SIGTERM'];
-    signals.forEach((sig) => {
-        process.once(sig, () => {
-            console.log(clc.yellow(`Received ${sig}, terminating Electron process...`));
-            child.kill(sig);
-        });
+        stdio: ['inherit', 'pipe', 'pipe']
     });
+    // Manejo centralizado de logs
     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
@@ -116,16 +105,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) {
-                compiler.close(() => { });
+            if (err)
                 return reject(err);
-            }
             if (stats?.hasErrors()) {
                 return reject(new Error(stats.toString({ all: false, errors: true, colors: true })));
             }
@@ -210,7 +199,7 @@ async function pack(callback) {
 function installExternals(callback) {
     let externals = options.externals.map((x) => {
         // Validar nombre del paquete
-        if (!/^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(x)) {
+        if (!/^[@a-z0-9-_./]+$/i.test(x)) {
             throw new Error(`Invalid package name: ${x}`);
         }
         const packageJsonPath = sanitizePath(path.resolve(options.src, '..', 'node_modules', x, 'package.json'));
@@ -240,6 +229,7 @@ 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

@@ -13,7 +13,9 @@ export default (env = {}, argv = {}) => {
         port: env.port ?? 8080,
         mode: argv.mode ?? 'production',
     };
-    const isDev = options.mode === 'watch';
+    const isDev = options.mode === 'development' ||
+        argv.watch === true ||
+        process.env.NODE_ENV === 'development';
     const buildPath = path.resolve(options.build);
     const controllerHtmlPath = path.resolve(options.src, 'index.html');
     const controllerStaticPath = path.resolve(path.dirname(controllerHtmlPath), '../static');
@@ -21,7 +23,7 @@ export default (env = {}, argv = {}) => {
     const controllerTestPath = path.resolve(options.src, 'test');
     return {
         mode: isDev ? 'development' : 'production',
-        target: 'electron-renderer',
+        target: options.target,
         entry: isDev ? [
             `webpack-dev-server/client?http://localhost:${options.port}/`,
             'webpack/hot/dev-server',
@@ -30,7 +32,7 @@ export default (env = {}, argv = {}) => {
         output: {
             path: buildPath,
             filename: '[name].js',
-            publicPath: isDev ? '/' : ''
+            publicPath: isDev ? '/' : './'
         },
         externals: {
             electron: 'commonjs electron',
@@ -76,7 +78,7 @@ export default (env = {}, argv = {}) => {
                     test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|mp4)$/,
                     type: 'asset/resource',
                     generator: {
-                        filename: isDev ? '[name][ext]' : '[name].[contenthash:8][ext]'
+                        filename: '[name][ext]'
                     }
                 },
                 {
@@ -112,7 +114,7 @@ export default (env = {}, argv = {}) => {
                 ]
             })
         ],
-        optimization: isDev ? undefined : {
+        optimization: {
             minimize: !isDev,
             minimizer: [
                 new TerserPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.12.0-dev.3",
+  "version": "2.12.0-dev.4",
   "type": "module",
   "license": "ISC",
   "bin": {
@@ -9,13 +9,13 @@
   "files": [
     "dist"
   ],
-  "main": "./dist/main.js",
+  "main": "dist/main.js",
   "scripts": {
     "start": "electron dist/electron.js --mode run --build ./dist/build",
     "clean": "rimraf dist",
     "build:main": "tsc -p tsconfig.json --outDir dist",
     "build:renderer": "webpack --config webpack.config.js --env src=./ --env build=./dist/build --mode production",
-    "copy:launcher": "cp launcher.html dist/launcher.html",
+    "copy:launcher": "cpy launcher.html dist",
     "build": "npm run clean && npm-run-all -p build:renderer build:main && npm run copy:launcher",
     "prerelease-dev": "standard-version --prerelease dev",
     "prerelease-rc": "standard-version --prerelease rc",
@@ -31,18 +31,19 @@
     "clean-webpack-plugin": "^4.0.0",
     "cli-color": "^1.2.0",
     "command-line-args": "^3.0.1",
-    "copy-webpack-plugin": "^12.0.2",
+    "copy-webpack-plugin": "^13.0.0",
+    "cpy-cli": "^5.0.0",
     "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": "^5.6.0",
+    "html-webpack-plugin": "^4.5.2",
     "lodash": "^4.17.21",
     "process": "^0.11.10",
     "raw-loader": "^0.5.1",
+    "rimraf": "^6.0.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",