@vixoniccom/module-packager 2.14.1-dev.5 → 2.14.2-dev.2

package/dist/electron.js

@@ -28,12 +28,8 @@ function createWindow() {
         width: 1024,
         height: 768,
         webPreferences: {
-            nodeIntegrationInSubFrames: true,
-            allowRunningInsecureContent: true,
-            nodeIntegration: true,
-            contextIsolation: false,
-            webSecurity: false,
-            webviewTag: true
+            webviewTag: true,
+            preload: path.join(__dirname, 'scripts', 'preload.js'),
         }
     });
     remoteMain.enable(mainWindow.webContents);

package/dist/launcher.html

@@ -8,85 +8,6 @@
 
 <body style="width: 100%; height: 100%; margin: 0; padding: 0;">
   <div id="webview-container" style="width: 100%; height: 100%;"></div>
-
-  <script>
-    const path = require('path')
-    let ModuleController;
-    try {
-      const moduleControllerModule = require('@vixoniccom/module-controller');
-      ModuleController = moduleControllerModule.default;     
-     } catch (err) {
-      console.error('[WEBVIEW] NO se pudo cargar ModuleController', err);
-    }
-    const { ipcRenderer } = require('electron')
-    const remote = require('@electron/remote')
-
-    ipcRenderer.on('init', (event, options) => {
-      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()
-        win.focus()
-      })
-
-      const resolvedSrc = options.mode === 'watch'
-        ? `http://localhost:${options.port}/index.html`
-        : `file://${path.join(options.build, 'index.html')}`
-
-      webview.src = resolvedSrc
-
-      document.getElementById('webview-container').appendChild(webview)
-
-      function getData() {
-        const data = {}
-
-        try {
-          data.parameters = require(path.join(options.src, 'test', 'parameters.json')).parameters
-        } catch (err) {
-          console.log('No parameters:', err.message)
-        }
-
-        let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
-
-        if (options.mode === 'watch') escaped = `file://${escaped}`
-        escaped = escaped.replace(/\\/g, '/')
-
-        data.downloadsPath = escaped
-
-
-        try {
-          data.services = require(path.join(options.src, 'test','services.json')).services
-        } catch (err) {
-          console.log('No services:', err.message)
-        }
-
-        return data
-      }
-
-      function getSchema() {
-        try {
-          return require(path.join(options.src, '../configuration.json')).schema
-        } catch (err) {
-          console.log('No schema:', err.message)
-          return {}
-        }
-      }
-
-      const data = getData()
-      const schema = getSchema()
-
-      ModuleController.init(win, webview, data, schema, options.mode === 'watch')
-    })
-  </script>
 </body>
 
 </html>

package/dist/scripts/preload.js

@@ -0,0 +1,59 @@
+// preload.ts
+import path from 'path';
+import { ipcRenderer } from 'electron';
+import remote from '@electron/remote';
+let ModuleController;
+try {
+    const m = require('@vixoniccom/module-controller');
+    ModuleController = m.default;
+}
+catch (err) {
+    console.error('[PRELOAD] No se pudo cargar ModuleController', err);
+}
+ipcRenderer.on('init', (_event, options) => {
+    const webview = document.createElement('webview');
+    webview.id = 'webview';
+    webview.style.width = '100%';
+    webview.style.height = '100%';
+    webview.setAttribute('partition', 'persist:webview');
+    webview.setAttribute('preload', `file://${path.join(__dirname, 'webview-preload.js')}`);
+    const win = remote.getCurrentWindow();
+    webview.addEventListener('did-finish-load', () => {
+        win.show();
+        win.focus();
+    });
+    const resolvedSrc = options.mode === 'watch'
+        ? `http://localhost:${options.port}/index.html`
+        : `file://${path.join(options.build, 'index.html')}`;
+    webview.src = resolvedSrc;
+    document.getElementById('webview-container')?.appendChild(webview);
+    function getData() {
+        const data = {};
+        try {
+            data.parameters = require(path.join(options.src, 'test', 'parameters.json')).parameters;
+        }
+        catch (err) {
+            console.log('No parameters:', err.message);
+        }
+        let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads');
+        if (options.mode === 'watch')
+            escaped = `file://${escaped}`;
+        data.downloadsPath = escaped.replace(/\\/g, '/');
+        try {
+            data.services = require(path.join(options.src, 'test', 'services.json')).services;
+        }
+        catch (err) {
+            console.log('No services:', err.message);
+        }
+        return data;
+    }
+    function getSchema() {
+        try {
+            return require(path.join(options.src, '../configuration.json')).schema;
+        }
+        catch {
+            return {};
+        }
+    }
+    ModuleController?.init(win, webview, getData(), getSchema(), options.mode === 'watch');
+});

package/dist/scripts/webview-preload.js

@@ -0,0 +1,13 @@
+import { ipcRenderer } from 'electron';
+ipcRenderer.on('preload', (_event, data) => {
+    window.postMessage({ channel: 'preload', data }, location.origin);
+});
+ipcRenderer.on('start', (_event, data) => {
+    window.postMessage({ channel: 'start', data }, location.origin);
+});
+ipcRenderer.on('update', (_event, data) => {
+    window.postMessage({ channel: 'update', data }, location.origin);
+});
+ipcRenderer.on('finish', () => {
+    window.postMessage({ channel: 'finish', data: null }, location.origin);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.14.1-dev.5",
+  "version": "2.14.2-dev.2",
   "type": "module",
   "license": "ISC",
   "bin": {
@@ -27,7 +27,7 @@
     "@electron/remote": "^2.1.2",
     "@types/which": "^3.0.4",
     "@vixoniccom/module-controller": "2.0.1-dev.2",
-    "@vixoniccom/modules": "^2.21.0",
+    "@vixoniccom/modules": "2.26.0-dev.1",
     "archiver": "^5.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "cli-color": "^1.2.0",