Skip to content

refactor: consolidate electron bootstrap into async function #4210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khassel merged 4 commits into from
Jul 18, 2026
Merged

refactor: consolidate electron bootstrap into async function #4210

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f40cf23
refactor: consolidate electron bootstrap into async function
KristjanESPERANTO Jul 18, 2026
747e8c0
docs: optimize before-quit handler comment
KristjanESPERANTO Jul 18, 2026
c086fa6
docs: add description to JSDoc block for createWindow
KristjanESPERANTO Jul 18, 2026
8eb488a
style: consolidate electron window option defaults
KristjanESPERANTO Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions js/electron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const BrowserWindow = electron.BrowserWindow;
let mainWindow;

/**
*
* Create and show the main browser window.
*/
function createWindow () {

Expand Down Expand Up @@ -58,15 +58,14 @@ function createWindow () {
nodeIntegration: false,
zoomFactor: config.zoom
},
backgroundColor: "#000000"
backgroundColor: "#000000",
show: false,
frame: false,
transparent: true,
hasShadow: false,
fullscreen: true
};

electronOptionsDefaults.show = false;
electronOptionsDefaults.frame = false;
electronOptionsDefaults.transparent = true;
electronOptionsDefaults.hasShadow = false;
electronOptionsDefaults.fullscreen = true;

const electronOptions = Object.assign({}, electronOptionsDefaults, config.electronOptions);

if (process.env.MOCK_DATE !== undefined) {
Expand Down Expand Up @@ -166,8 +165,10 @@ app.on("activate", function () {
});

/*
* This method will be called when SIGINT is received and will call
* each node_helper's stop function if it exists. Added to fix #1056
* Electron routes SIGINT (and other quit signals) to the app's quit sequence,
* which triggers this "before-quit" event. This handler calls each
* node_helper's stop function if it exists.
* Added to fix #1056 (no method to gracefully shut down modules on exit).
*
* Note: this is only used if running Electron. Otherwise
* core.stop() is called by process.on("SIGINT"... in `app.js`
Expand All @@ -190,23 +191,26 @@ app.on("certificate-error", (event, webContents, url, error, certificate, callba
callback(true);
});

if (process.env.clientonly) {
app.whenReady().then(() => {
/**
* Bootstrap Electron: launch the client-only viewer and/or the full core application.
*/
async function bootstrapElectron () {
if (process.env.clientonly) {
await app.whenReady();
Log.log("Launching client viewer application.");
createWindow();
});
}
}

/*
* Start the core application if server is run on localhost
* This starts all node helpers and starts the webserver.
*/
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) {
core.start().then((c) => {
config = c;
app.whenReady().then(() => {
Log.log("Launching application.");
createWindow();
});
});
/*
* Start the core application if server is run on localhost
* This starts all node helpers and starts the webserver.
*/
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) {
config = await core.start();
await app.whenReady();
Log.log("Launching application.");
createWindow();
}
}

bootstrapElectron();