Bump electron; Use exposeInMainWorld; (#41)

* Bymp electron; Use exposeInMainWorld; * Add test case; Co-authored-by: Kiril Knysh <>
21-23 · Jun 15, 2021 · 36b47ce · 36b47ce
1 parent a9c0fc9
commit 36b47ce
Show file tree

Hide file tree

Showing 10 changed files with 215 additions and 169 deletions.
diff --git a/app/backends/electron/e-app/e-app.js b/app/backends/electron/e-app/e-app.js
@@ -117,12 +117,19 @@ function buildSandUrl(sand) {
 }
 
 function createWorker(options) {
-    const win = new BrowserWindow(Object.assign({
-        webPreferences: {
-            nodeIntegration: true,
-            nodeIntegrationInWorker: true,
-        },
-    }, args.browserWindow));
+    const win = new BrowserWindow(
+        Object.assign(
+            {
+                webPreferences: {
+                    nodeIntegration: false,
+                    nodeIntegrationInWorker: false,
+                    contextIsolation: true,
+                    preload: path.join(__dirname, 'preload.js'),
+                },
+            },
+            args.browserWindow
+        )
+    );
     const webContents = win.webContents;
 
     if (args.showDevTools && args.browserWindow.show) {

diff --git a/app/backends/electron/e-app/preload.js b/app/backends/electron/e-app/preload.js
@@ -0,0 +1,20 @@
+const { contextBridge, ipcRenderer } = require('electron');
+
+// inspired by https://stackoverflow.com/a/59888788/1404942
+contextBridge.exposeInMainWorld('qd', {
+    onWorkerCreated(payload) {
+        ipcRenderer.send('wrk::created', payload);
+    },
+    onWorkerFilled(payload) {
+        ipcRenderer.send('wrk::filled', payload);
+    },
+    onWorkerDone(payload) {
+        ipcRenderer.send('wrk::done', payload);
+    },
+
+    onMessage(callback) {
+        ipcRenderer.on('message', (event, ...args) => {
+            callback(...args);
+        });
+    },
+});
diff --git a/app/backends/electron/e-app/sand/css.html b/app/backends/electron/e-app/sand/css.html
@@ -18,7 +18,6 @@
                 expectedLength: undefined,
                 qdidAttr: ''
             };
-            var ipcRenderer = require('electron').ipcRenderer;
 
             function evaluate(task, puzzleScope) {
                 // Throws a SYNTAX_ERR exception if the specified group of selectors is invalid.
@@ -46,7 +45,7 @@
             }
 
             function onWorkerInit() {
-                ipcRenderer.send('wrk::created', { path: [] });
+                window.qd.onWorkerCreated({ path: [] });
             }
 
             function onWorkerFill(payload) {
@@ -69,7 +68,7 @@
 
                 payload.content = undefined; // no need to transfer back the filler
 
-                ipcRenderer.send('wrk::filled', payload);
+                window.qd.onWorkerFilled(payload);
             }
 
             function onWorkerExec(payload) {
@@ -91,10 +90,10 @@
                     }
                 }
 
-                ipcRenderer.send('wrk::done', payload);
+                window.qd.onWorkerDone(payload);
             }
 
-            ipcRenderer.on('message', function (event, message) {
+            window.qd.onMessage(function (message) {
                 switch (message.type) {
                     case 'wrk:>init':
                         return onWorkerInit();

diff --git a/app/backends/electron/e-app/sand/js.html b/app/backends/electron/e-app/sand/js.html
@@ -18,13 +18,12 @@
                 hidden: [] // array of objects { input: {JSON}, expected: {JSON} }
             };
             var inputCopies = 200;
-            var ipcRenderer = require('electron').ipcRenderer;
             window.require = stubFun;
             window.process = stub;
 
             function evaluate(task, puzzleContent) {
                 try {
-                    var result = eval('(function(_, content, ipcRenderer, window, document, location, alert, $, require, process, global, setTimeout, setInterval, requestAnimationFrame, requestIdleCallback) {"use strict"; return (function (arg) {' + task.input + '})(content);}).call(stub, stub, puzzleContent, stub, stub, stub, stub, stubFun, stub, stubFun, stub, stub, stubFun, stubFun, stubFun, stubFun)');
+                    var result = eval('(function(_, content, ipcRenderer, window, document, location, alert, $, require, process, global, setTimeout, setInterval, requestAnimationFrame, requestIdleCallback, qd) {"use strict"; return (function (arg) {' + task.input + '})(content);}).call(stub, stub, puzzleContent, stub, stub, stub, stub, stubFun, stub, stubFun, stub, stub, stubFun, stubFun, stubFun, stubFun, stub)');
 
                     return [null, result];
                 } catch (e) {
@@ -54,7 +53,7 @@
             }
 
             function onWorkerInit() {
-                ipcRenderer.send('wrk::created', { path: [] });
+                window.qd.onWorkerCreated({ path: [] });
             }
 
             function onWorkerFill(payload) {
@@ -104,7 +103,7 @@
 
                 payload.content = undefined; // no need to transfer back the filler
 
-                ipcRenderer.send('wrk::filled', payload);
+                window.qd.onWorkerFilled(payload);
             }
 
             function onWorkerExec(payload) {
@@ -135,10 +134,10 @@
                     }
                 }
 
-                ipcRenderer.send('wrk::done', payload);
+                window.qd.onWorkerDone(payload);
             }
 
-            ipcRenderer.on('message', function (event, message) {
+            window.qd.onMessage(function (message) {
                 switch (message.type) {
                     case 'wrk:>init':
                         return onWorkerInit();

diff --git a/app/backends/electron/e-app/sand/js/subworkers.html b/app/backends/electron/e-app/sand/js/subworkers.html
@@ -3,7 +3,6 @@
 <head>
     <script>
         (function() {
-            var ipcRenderer = require('electron').ipcRenderer;
             var subworkerCounter = 0;
             var subworkers = {};
 
@@ -12,17 +11,17 @@
 
                 switch(data.type) {
                     case 'wrk::created':
-                        return ipcRenderer.send('wrk::created', {
+                        return window.qd.onWorkerCreated({
                             path: [subworkerId].concat(data.payload.path)
                         });
                     case 'wrk::filled':
-                        return ipcRenderer.send('wrk::filled', {
+                        return window.qd.onWorkerFilled({
                             path: [subworkerId].concat(data.payload.path),
                             fillerId: data.payload.fillerId
                         });
                     case 'wrk::done':
                         data.payload.path = [subworkerId].concat(data.payload.path)
-                        return ipcRenderer.send('wrk::done', data.payload);
+                        return window.qd.onWorkerDone(data.payload);
                 }
             }
 
@@ -93,7 +92,7 @@
                 createSubworker(subworkerId);
             }
 
-            ipcRenderer.on('message', function (event, message) {
+            window.qd.onMessage(function (message) {
                 switch (message.type) {
                     case 'wrk:>init':
                         return onWorkerInit(message.payload);

diff --git a/app/backends/electron/e-app/sand/lodash.html b/app/backends/electron/e-app/sand/lodash.html
@@ -18,14 +18,13 @@
                 hidden: [] // array of objects { input: {JSON}, expected: {JSON} }
             };
             var inputCopies = 200;
-            var ipcRenderer = require('electron').ipcRenderer;
             var _lodash = Object.freeze(_);
             window.require = stubFun;
             window.process = stub;
 
             function evaluate(task, puzzleContent) {
                 try {
-                    var result = eval('(function(_, content, ipcRenderer, window, document, location, alert, $, require, process, global, setTimeout, setInterval, requestAnimationFrame, requestIdleCallback) {"use strict"; return _.chain(content).' + task.input + '.value()}).call(stub, _lodash, puzzleContent, stub, stub, stub, stub, stubFun, stub, stubFun, stub, stub, stubFun, stubFun, stubFun, stubFun)');
+                    var result = eval('(function(_, content, ipcRenderer, window, document, location, alert, $, require, process, global, setTimeout, setInterval, requestAnimationFrame, requestIdleCallback, qd) {"use strict"; return _.chain(content).' + task.input + '.value()}).call(stub, _lodash, puzzleContent, stub, stub, stub, stub, stubFun, stub, stubFun, stub, stub, stubFun, stubFun, stubFun, stubFun, stub)');
 
                     return [null, result];
                 } catch (e) {
@@ -55,7 +54,7 @@
             }
 
             function onWorkerInit() {
-                ipcRenderer.send('wrk::created', { path: [] });
+                window.qd.onWorkerCreated({ path: [] });
             }
 
             function onWorkerFill(payload) {
@@ -105,7 +104,7 @@
 
                 payload.content = undefined; // no need to transfer back the filler
 
-                ipcRenderer.send('wrk::filled', payload);
+                window.qd.onWorkerFilled(payload);
             }
 
             function onWorkerExec(payload) {
@@ -136,10 +135,10 @@
                     }
                 }
 
-                ipcRenderer.send('wrk::done', payload);
+                window.qd.onWorkerDone(payload);
             }
 
-            ipcRenderer.on('message', function (event, message) {
+            window.qd.onMessage(function (message) {
                 switch (message.type) {
                     case 'wrk:>init':
                         return onWorkerInit();

diff --git a/app/backends/electron/e-app/sand/lodash/subworkers.html b/app/backends/electron/e-app/sand/lodash/subworkers.html
@@ -3,7 +3,6 @@
 <head>
     <script>
         (function() {
-            var ipcRenderer = require('electron').ipcRenderer;
             var subworkerCounter = 0;
             var subworkers = {};
 
@@ -12,17 +11,17 @@
 
                 switch(data.type) {
                     case 'wrk::created':
-                        return ipcRenderer.send('wrk::created', {
+                        return window.qd.onWorkerCreated({
                             path: [subworkerId].concat(data.payload.path)
                         });
                     case 'wrk::filled':
-                        return ipcRenderer.send('wrk::filled', {
+                        return window.qd.onWorkerFilled({
                             path: [subworkerId].concat(data.payload.path),
                             fillerId: data.payload.fillerId
                         });
                     case 'wrk::done':
                         data.payload.path = [subworkerId].concat(data.payload.path)
-                        return ipcRenderer.send('wrk::done', data.payload);
+                        return window.qd.onWorkerDone(data.payload);
                 }
             }
 
@@ -93,7 +92,7 @@
                 createSubworker(subworkerId);
             }
 
-            ipcRenderer.on('message', function (event, message) {
+            window.qd.onMessage(function (message) {
                 switch (message.type) {
                     case 'wrk:>init':
                         return onWorkerInit(message.payload);