@vixoniccom/module-packager 2.15.0-dev.1 → 2.15.0-dev.3

package/dist/electron.js

@@ -28,11 +28,13 @@ function createWindow() {
         width: 1024,
         height: 768,
         webPreferences: {
-            nodeIntegrationInSubFrames: true,
-            allowRunningInsecureContent: true,
-            nodeIntegration: true,
+            preload: path.join(__dirname, 'launcher-preload.cjs'),
+            nodeIntegration: false,
             contextIsolation: false,
-            webSecurity: false,
+            webSecurity: true,
+            allowRunningInsecureContent: false,
+            nodeIntegrationInSubFrames: false,
+            sandbox: false,
             webviewTag: true
         }
     });

package/dist/launcher-preload.cjs

@@ -0,0 +1,77 @@
+const path = require('path')
+
+let ModuleController
+try {
+  const mod = require('@vixoniccom/module-controller')
+  ModuleController = mod.default
+} catch (err) {
+  console.error('[launcher-preload] Could not load 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')
+})

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.15.0-dev.1",
+  "version": "2.15.0-dev.3",
   "type": "module",
   "license": "ISC",
   "bin": {
@@ -19,7 +19,7 @@
     "prepublish": "npm run build",
     "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": "cpy launcher.html dist",
+    "copy:launcher": "cpy launcher.html launcher-preload.cjs 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",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@electron/remote": "2.1.3",
     "@types/which": "^3.0.4",
-    "@vixoniccom/module-controller": "2.1.0-dev.2",
+    "@vixoniccom/module-controller": "2.1.0-dev.3",
     "@vixoniccom/modules": "2.26.4",
     "archiver": "^5.3.0",
     "clean-webpack-plugin": "^4.0.0",