Bugfixes and API changes for updated Electron

src/AtomShell/main.js

@@ -1,5 +1,6 @@
-const {app, BrowserWindow} = require('electron')
-var net = require("net");
+const { app, BrowserWindow, ipcMain, dialog } = require('electron');
+const net = require("net");
+const path = require("path");
 
 function arg(name) {
   for (var i = 0; i < process.argv.length; i++) {
@@ -70,14 +71,26 @@ var port = parseInt(arg('port'));
 server.listen(port);
 
 app.on("ready", function() {
-  app.on('window-all-closed', function(e) {
-  });
+  app.on('window-all-closed', function(e) { /*  */ });
+  ipcMain.handle("dialog:openFile", (evt, opts) => dialog.showOpenDialog(evt.sender.getOwnerBrowserWindow(), opts));
+  ipcMain.handle("dialog:saveFile", (evt, opts) => dialog.showSaveDialog(evt.sender.getOwnerBrowserWindow(), opts));
 });
 
 // Window creation
 var windows = {};
 
 function createWindow(opts) {
+  // Store the user defined preload script(s), if any, to pass to our preload script.
+  let userPreloads = opts.webPreferences?.preload ?? [];
+  // Merge in the required scripts as additionalArguments and overwrite preload.
+  opts.webPreferences = { ...opts.webPreferences, ...{
+    additionalArguments: [
+      ...opts.webPreferences?.additionalArguments ?? [],
+      ...(Array.isArray(userPreloads) ? userPreloads : [userPreloads]).map(f => `--blink-preloadjs=${f}`)
+    ],
+    preload: path.join(__dirname, 'preload.js')
+  }};
+
   var win = new BrowserWindow(opts);
   windows[win.id] = win;
   if (opts.url) {

src/AtomShell/preload.js

@@ -0,0 +1,22 @@
+const { contextBridge, ipcRenderer } = require('electron');
+
+/* This will execute require on the scripts given as arguments and ignore other args because the regex turns them empty (false)  */
+process.argv.map(str => str.replace(/((?:^--blink-preloadjs=)|(?:^.*$))/, '')).filter(Boolean).forEach(function (filepath) {
+    try {
+        require(filepath);
+    } catch (err) {
+        console.log(err);
+    }
+});
+
+const dialogHandlers = {
+    showOpenDialog: (opts, cb) => ipcRenderer.invoke("dialog:openFile", opts).then(res => cb(res.filePaths)),
+    showSaveDialog: (opts, cb) => ipcRenderer.invoke("dialog:saveFile", opts).then(res => cb(res.filePath)),
+};
+
+/* If a user disables contextIsolation we'll need to handle that. */
+if (process.contextIsolated) {
+    contextBridge.exposeInMainWorld('dialog', dialogHandlers);
+} else {
+    window.dialog = dialogHandlers;
+}

src/AtomShell/process.jl

@@ -47,6 +47,7 @@ end
 import Base: Process
 
 export Electron
+const _electron = artifact"electronjs_app"
 
 mutable struct Electron <: Shell
   proc::Process
@@ -56,8 +57,15 @@ end
 
 Electron(proc, sock) = Electron(proc, sock, Dict())
 
-const _electron = artifact"electronjs_app"
-const mainjs = resolve_blink_asset("src", "AtomShell", "main.js")
+"""
+resolve_electron_asset(path...)
+
+Find a file, expressed as a relative path from the folder where
+the Electron artifact was extracted. Example:
+
+  resolve_electron_asset("julia.png") -> /home/<user>/.julia/artifacts/<git-tree-sha1>/julia.png
+"""
+resolve_electron_asset(path...) = abspath(joinpath(_electron, path...))
 
 function electron()
   if Sys.isapple()
@@ -82,11 +90,13 @@ function try_connect(args...; interval = 0.01, attempts = 500)
   end
 end
 
+const mainjs = resolve_blink_asset("src", "AtomShell", "main.js")
+
 function init(; debug = false)
   electron() # Check path exists
   p, dp = port(), port()
   debug && inspector(dp)
-  dbg = debug ? "--debug=$dp" : []
+  dbg = debug ? "--inspect=$dp" : []
   proc = (debug ? run_rdr : run)(`$(electron()) $dbg $mainjs port $p`; wait=false)
   conn = try_connect(ip"127.0.0.1", p)
   shell = Electron(proc, conn)

src/AtomShell/window.jl

@@ -32,15 +32,26 @@ function Window end
 shell(win::Window) = win.shell
 id(win::Window) = win.id
 
+# Deep merge code adapted from the Discourse solutions given by
+# @hhaensel (https://discourse.julialang.org/t/multi-layer-dict-merge/27261/6), and
+# @MilesCranmer (https://discourse.julialang.org/t/multi-layer-dict-merge/27261/7)
+recursive_merge(x::AbstractDict...) = merge(recursive_merge, x...)
+#recursive_merge(x::AbstractVector...) = reduce(vcat, x)
+recursive_merge(x...) = last(x)
+# Whether or not we decide that vectors should be merged depends on the window_defaults.
+# Currently disabled (e.g. replace Vector values instead of concatenating them)
+
 const window_defaults = Dict(
   :url => "about:blank",
   :title => "Julia",
-  "node-integration" => false,
-  "use-content-size" => true,
-  :icon => resolve_blink_asset("deps", "julia.png")
+  :icon => resolve_electron_asset("julia.png"),
+  :webPreferences => Dict(
+    :nodeIntegration => false,
+    :useContentSize => true
+  )
 )
 
-raw_window(a::Electron, opts) = @js a createWindow($(merge(window_defaults, opts)))
+raw_window(a::Electron, opts) = @js a createWindow($(mergewith(recursive_merge, window_defaults, opts)))
 
 function Window(a::Shell, opts::AbstractDict = Dict(); async=false, body=nothing)
   # TODO: Custom urls don't support async b/c don't load Blink.js. (Same as https://github.com/JunoLab/Blink.jl/issues/150)