@vixoniccom/module-packager 2.12.0 → 2.13.0-dev.0

package/dist/electron.js

@@ -40,7 +40,6 @@ function createWindow() {
     const launcherPath = path.join(__dirname, 'launcher.html');
     const launcherURL = `file://${launcherPath}`;
     mainWindow.loadURL(launcherURL);
-    // mainWindow.webContents.openDevTools({ mode: 'detach' })
     mainWindow.webContents.once('did-finish-load', () => {
         mainWindow?.show();
         mainWindow?.webContents.send('init', options);

package/dist/launcher.html

@@ -7,7 +7,6 @@
 </head>
 
 <body style="width: 100%; height: 100%; margin: 0; padding: 0;">
-  <!-- Remover el webview del HTML -->
   <div id="webview-container" style="width: 100%; height: 100%;"></div>
 
   <script>
@@ -23,7 +22,6 @@
     const remote = require('@electron/remote')
 
     ipcRenderer.on('init', (event, options) => {
-      // Crear el webview dinámicamente
       const webview = document.createElement('webview')
       webview.id = 'webview'
       webview.style.width = '100%'
@@ -46,7 +44,6 @@
 
       webview.src = resolvedSrc
 
-      // Añadir el webview al DOM después de configurarlo
       document.getElementById('webview-container').appendChild(webview)
 
       function getData() {
@@ -60,7 +57,6 @@
 
         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, '/')
 

package/dist/main.js

@@ -13,6 +13,7 @@ import { Configuration } from '@vixoniccom/modules';
 import tsNode from 'ts-node';
 import { createRequire } from 'module';
 import which from 'which';
+import 'dotenv/config';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const electronPath = path.join(__dirname, 'electron.js');
@@ -37,30 +38,24 @@ const optionDefinitions = [
     { name: 'tsOverride', type: Boolean }
 ];
 const options = commandLineArgs(optionDefinitions);
-// Validación de entrada mejorada
 function validateOptions(options) {
     if (options.target !== 'electron-renderer' && options.externals.length > 0) {
         throw new Error(`Can't use external dependencies if target is not electron-renderer.`);
     }
-    // Validar puerto
     if (options.port < 1 || options.port > 65535) {
         throw new Error('Port must be between 1 and 65535');
     }
-    // Validar modo
     const validModes = ['build', 'watch', 'run', 'generate-configuration', 'validate-configuration'];
     if (!validModes.includes(options.mode)) {
         throw new Error(`Invalid mode. Must be one of: ${validModes.join(', ')}`);
     }
 }
-// Función para sanitizar rutas
 function sanitizePath(inputPath) {
-    // Prevenir path traversal
     if (inputPath.includes('..') || inputPath.includes('~')) {
         throw new Error('Invalid path: path traversal detected');
     }
     return path.resolve(inputPath);
 }
-// Función centralizada para crear argumentos de Electron
 function createElectronArgs(mode) {
     return [
         electronPath,
@@ -72,7 +67,6 @@ function createElectronArgs(mode) {
         ...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';
@@ -86,11 +80,9 @@ function spawnElectronProcess(mode) {
         },
         stdio: ['inherit', 'pipe', 'pipe']
     });
-    // Manejo centralizado de logs
     setupChildProcessLogging(child);
     return child;
 }
-// Función para manejar logging de procesos hijo
 function setupChildProcessLogging(child) {
     child.stdout?.on('data', (data) => {
         const output = data.toString();
@@ -105,20 +97,19 @@ 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) => {
+        compiler?.run((err, stats) => {
             if (err)
-                return reject(err);
+                return reject(new Error(`Webpack compilation error: ${err.message}`));
             if (stats?.hasErrors()) {
-                return reject(new Error(stats.toString({ all: false, errors: true, colors: true })));
+                const errorMessage = stats.toString({ all: false, errors: true, colors: true });
+                return reject(new Error(`Webpack compilation failed: ${errorMessage}`));
             }
-            compiler.close(closeErr => (closeErr ? reject(closeErr) : resolve()));
+            compiler.close(closeErr => (closeErr ? reject(new Error(`Webpack compilation error: ${closeErr}`)) : resolve()));
         });
     });
 }
@@ -175,7 +166,11 @@ async function pack(callback) {
                 else {
                     console.error(clc.red(JSON.stringify(info, null, 2)));
                 }
-                callback?.(stats);
+                // CORREGIDO: Pasar un objeto Error en lugar de stats
+                const errorMessage = info.errors?.length
+                    ? info.errors.map((e) => typeof e === 'object' ? JSON.stringify(e) : e).join('\n')
+                    : 'Webpack compilation failed with errors';
+                callback?.(new Error(errorMessage));
             }
             else {
                 console.log(clc.green('Build OK.'));
@@ -244,7 +239,6 @@ function zip() {
     clc.move(-2, 0);
 }
 async function watch() {
-    // 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));

package/dist/webpack.config.js

@@ -13,9 +13,7 @@ export default (env = {}, argv = {}) => {
         port: env.port ?? 8080,
         mode: argv.mode ?? 'production',
     };
-    const isDev = options.mode === 'development' ||
-        argv.watch === true ||
-        process.env.NODE_ENV === 'development';
+    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');
@@ -24,20 +22,22 @@ export default (env = {}, argv = {}) => {
     return {
         mode: isDev ? 'development' : 'production',
         target: options.target ?? 'electron-renderer',
-        entry: isDev ? [
-            `webpack-dev-server/client?http://localhost:${options.port}/`,
-            'webpack/hot/dev-server',
-            path.resolve(options.src, 'main.ts')
-        ] : path.resolve(options.src, 'main.ts'),
+        entry: isDev
+            ? [
+                `webpack-dev-server/client?http://localhost:${options.port}/`,
+                'webpack/hot/dev-server',
+                path.resolve(options.src, 'main.ts'),
+            ]
+            : path.resolve(options.src, 'main.ts'),
         output: {
             path: buildPath,
             filename: '[name].js',
-            publicPath: isDev ? '/' : './'
+            publicPath: isDev ? '/' : './',
         },
         performance: {
             maxAssetSize: 2000000, //2MB
             maxEntrypointSize: 2000000,
-            hints: isDev ? false : 'warning'
+            hints: isDev ? false : 'warning',
         },
         externals: {
             electron: 'commonjs electron',
@@ -46,7 +46,7 @@ export default (env = {}, argv = {}) => {
             'terser-webpack-plugin': 'commonjs terser-webpack-plugin',
             esbuild: 'commonjs esbuild',
             '@swc/core': 'commonjs @swc/core',
-            '@swc/wasm': 'commonjs @swc/wasm'
+            '@swc/wasm': 'commonjs @swc/wasm',
         },
         resolve: {
             extensions: ['.tsx', '.ts', '.js', '.jsx', '.mjs'],
@@ -54,9 +54,9 @@ export default (env = {}, argv = {}) => {
             fullySpecified: false,
             fallback: {
                 process: require.resolve('process/browser.js'),
-                global: require.resolve('global')
+                global: require.resolve('global'),
             },
-            modules: ['node_modules', 'src', 'static']
+            modules: ['node_modules', 'src', 'static'],
         },
         module: {
             rules: [
@@ -66,25 +66,25 @@ export default (env = {}, argv = {}) => {
                     use: {
                         loader: 'ts-loader',
                         options: {
-                            transpileOnly: true
-                        }
-                    }
+                            transpileOnly: true,
+                        },
+                    },
                 },
                 {
                     test: /\.s[ac]ss$/,
-                    use: ['style-loader', 'css-loader', 'sass-loader']
+                    use: ['style-loader', 'css-loader', 'sass-loader'],
                 },
                 {
                     test: /\.css$/,
                     use: ['style-loader', 'css-loader'],
-                    exclude: /node_modules/
+                    exclude: /node_modules/,
                 },
                 {
                     test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|mp4)$/,
                     type: 'asset/resource',
                     generator: {
-                        filename: '[name][ext]'
-                    }
+                        filename: '[name][ext]',
+                    },
                 },
                 {
                     test: /\.html$/,
@@ -92,32 +92,38 @@ export default (env = {}, argv = {}) => {
                         loader: 'html-loader',
                         options: {
                             sources: false,
-                        }
-                    }
-                }
-            ]
+                        },
+                    },
+                },
+            ],
         },
         plugins: [
             new webpack.DefinePlugin({
-                global: 'globalThis'
+                global: 'globalThis',
+                // env variables
+                'process.env.AQI_TOKEN': JSON.stringify(process.env.AQI_TOKEN || ''),
+                'process.env.PTS_CLIENT_ID': JSON.stringify(process.env.PTS_CLIENT_ID || ''),
+                'process.env.PTS_CLIENT_SECRET': JSON.stringify(process.env.PTS_CLIENT_SECRET || ''),
+                'process.env.FS_API_KEY': JSON.stringify(process.env.FS_API_KEY || ''),
+                'process.env.FS_API_HOST': JSON.stringify(process.env.FS_API_HOST || ''),
             }),
             new webpack.ProvidePlugin({
-                process: 'process/browser.js'
+                process: 'process/browser.js',
             }),
             new CleanWebpackPlugin(),
             new HtmlWebpackPlugin({
                 template: controllerHtmlPath,
                 filename: 'index.html',
                 inject: 'body',
-                chunks: ['main']
+                chunks: ['main'],
             }),
             new CopyWebpackPlugin({
                 patterns: [
                     { from: controllerStaticPath, to: 'static', noErrorOnMissing: true },
                     { from: controllerFontsPath, to: 'fonts', noErrorOnMissing: true },
-                    { from: controllerTestPath, to: 'test', noErrorOnMissing: true }
-                ]
-            })
+                    { from: controllerTestPath, to: 'test', noErrorOnMissing: true },
+                ],
+            }),
         ],
         optimization: {
             minimize: !isDev,
@@ -128,31 +134,33 @@ export default (env = {}, argv = {}) => {
                         ecma: 2020,
                         compress: true,
                         mangle: true,
-                        format: { comments: false }
-                    }
-                })
-            ]
+                        format: { comments: false },
+                    },
+                }),
+            ],
         },
         devtool: isDev ? 'source-map' : false,
-        devServer: isDev ? {
-            static: [
-                {
-                    directory: path.resolve(options.src, 'test'),
-                    publicPath: '/test',
-                    watch: true,
-                }
-            ],
-            open: false,
-            client: {
-                overlay: true
-            },
-            port: options.port || 8080,
-            hot: true,
-            historyApiFallback: true,
-            devMiddleware: {
-                publicPath: '/',
-                writeToDisk: false
+        devServer: isDev
+            ? {
+                static: [
+                    {
+                        directory: path.resolve(options.src, 'test'),
+                        publicPath: '/test',
+                        watch: true,
+                    },
+                ],
+                open: false,
+                client: {
+                    overlay: true,
+                },
+                port: options.port || 8080,
+                hot: true,
+                historyApiFallback: true,
+                devMiddleware: {
+                    publicPath: '/',
+                    writeToDisk: false,
+                },
             }
-        } : undefined
+            : undefined,
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.12.0",
+  "version": "2.13.0-dev.0",
   "type": "module",
   "license": "ISC",
   "bin": {
@@ -34,6 +34,7 @@
     "copy-webpack-plugin": "^13.0.0",
     "cpy-cli": "^5.0.0",
     "css-loader": "^7.1.2",
+    "dotenv": "^17.2.1",
     "electron": "^36.1.0",
     "electron-debug": "^3.2.0",
     "global": "^4.4.0",