From cac873ff1c13af2b0bf34e0826b719dd138d4053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Wawrzyniec=20Urba=C5=84czyk?= Date: Fri, 2 Apr 2021 15:52:22 +0200 Subject: [PATCH] Fix Backend Dying (https://github.com/enso-org/ide/pull/1428) Original commit: https://github.com/enso-org/ide/commit/63917f4a656118129e1235f213537805be6e112e --- gui/CHANGELOG.md | 3 ++ gui/src/js/lib/client/src/index.js | 47 +++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/gui/CHANGELOG.md b/gui/CHANGELOG.md index a7aaea1ed28..0f9ee0bd01f 100644 --- a/gui/CHANGELOG.md +++ b/gui/CHANGELOG.md @@ -105,6 +105,8 @@ when the mouse events are passed to the visualization. - [Fixed an issue when projects containing certain language constructs failed to load.][1413] +- [Fixed a case where IDE could lose connection to the backend after some + time.][1428] #### EnsoGL (rendering engine) @@ -147,6 +149,7 @@ you can find their release notes [1412]: https://github.com/enso-org/ide/pull/1412 [1419]: https://github.com/enso-org/ide/pull/1419 [1413]: https://github.com/enso-org/ide/pull/1413 +[1428]: https://github.com/enso-org/ide/pull/1428
diff --git a/gui/src/js/lib/client/src/index.js b/gui/src/js/lib/client/src/index.js index 1b344f1050a..e953117bf14 100644 --- a/gui/src/js/lib/client/src/index.js +++ b/gui/src/js/lib/client/src/index.js @@ -332,28 +332,67 @@ Electron.app.on('web-contents-created', (event,contents) => { // === Project Manager === // ======================= -async function withBackend(opts) { +function projectManagerPath() { let binPath = args['backend-path'] if (!binPath) { binPath = paths.get_project_manager_path(resources) } let binExists = fss.existsSync(binPath) assert(binExists, `Could not find the project manager binary at ${binPath}.`) + return binPath +} - let out = await execFile(binPath,opts).catch(function(err) {throw err}) +/** + * Executes the Project Manager with given arguments. + * + * Note that this function captures all the Project Manager output into a fixed + * size buffer. If too much output is produced, it will fail and Project + * Manager process will prematurely close. + * + * @param {string[]} args Project Manager command line arguments. + * @returns Promise with captured standard output and error contents. + */ +async function execProjectManager(args) { + let binPath = projectManagerPath() + return await execFile(binPath,args).catch(function(err) {throw err}) +} + +/** + * Spawn process with Project Manager, + * + * The standard output and error handles will be inherited, i.e. will be + * redirected to the electron's app output and error handles. Input is piped + * to this process, so it will not be closed, until this process finished. + * + * @param {string[]} args + * @returns Handle to the spawned process. + */ +function spawnProjectManager(args) { + let binPath = projectManagerPath() + let stdin = 'pipe' + let stdout = 'inherit' + let stderr = 'inherit' + let opts = { + stdio: [stdin,stdout,stderr] + } + let out = child_process.spawn(binPath,args,opts) + console.log(`Project Manager has been spawned, pid = ${out.pid}.`) + out.on('exit', (code) => { + console.log(`Project Manager exited with code ${code}.`) + }) return out } function runBackend() { if(args.backend !== false) { console.log("Starting the backend process.") - withBackend() + return spawnProjectManager() } } async function backendVersion() { if(args.backend !== false) { - return await withBackend(['--version']).then((t) => t.stdout) + return await execProjectManager(['--version']).then((t) => t.stdout) } }