feat: add bee lifecycle management to tray

index.js

@@ -1,7 +1,5 @@
-const { runLauncher } = require('./src/launcher')
 const { runElectronTray } = require('./src/electron')
 const { runStaticServer } = require('./src/static-server')
 
-runLauncher()
 runElectronTray()
 runStaticServer()

src/electron.js

@@ -1,17 +1,44 @@
 const { app, Tray, Menu, shell } = require('electron')
+const { runLauncher } = require('./launcher')
+const { BeeManager } = require('./lifecycle')
 
 let tray
 
+function rebuildElectronTray() {
+    const contextMenu = Menu.buildFromTemplate([
+        {
+            label: BeeManager.isRunning() ? 'Stop Bee' : 'Start Bee',
+            click: () => {
+                if (BeeManager.isRunning()) {
+                    BeeManager.stop()
+                } else {
+                    runLauncher()
+                }
+            }
+        },
+        { type: 'separator' },
+        { label: 'Open Web UI', click: () => shell.openExternal('http://localhost:5000') },
+        { type: 'separator' },
+        {
+            label: 'Exit',
+            click: async () => {
+                BeeManager.stop()
+                await BeeManager.waitForSigtermToFinish()
+                app.quit()
+            }
+        }
+    ])
+    tray.setContextMenu(contextMenu)
+}
+
 function main() {
     app.whenReady().then(() => {
         tray = new Tray('tray.png')
-        const contextMenu = Menu.buildFromTemplate([
-            { label: 'Open Web UI', click: () => shell.openExternal('http://localhost:5000') }
-        ])
-        tray.setContextMenu(contextMenu)
+        rebuildElectronTray()
     })
 }
 
 module.exports = {
-    runElectronTray: main
+    runElectronTray: main,
+    rebuildElectronTray
 }

src/launcher.js

@@ -3,8 +3,11 @@ const { existsSync, readFileSync, writeFileSync, mkdirSync } = require('fs')
 const { exit } = require('process')
 const { resolve } = require('path')
 const { spawn } = require('child_process')
+const { BeeManager } = require('./lifecycle')
 
 async function main() {
+    const { rebuildElectronTray } = require('./electron')
+    const abortController = new AbortController()
     if (!existsSync('bee')) {
         console.error(`Please compile bee and place it as follows: ${resolve('bee')}`)
         exit(1)
@@ -25,7 +28,16 @@ async function main() {
         const { transaction, blockHash } = await sendTransaction(address)
         writeFileSync('config.yaml', createConfiguration(transaction, blockHash))
     }
-    launchBee()
+    const subprocess = launchBee(abortController).catch(reason => {
+        console.error(reason)
+    })
+    BeeManager.signalRunning(abortController, subprocess)
+    rebuildElectronTray()
+    await subprocess
+    console.log('Bee subprocess finished running')
+    abortController.abort()
+    BeeManager.signalStopped()
+    rebuildElectronTray()
 }
 
 async function sendTransaction(address) {
@@ -54,9 +66,9 @@ transaction: ${transaction}
 block-hash: ${blockHash}`
 }
 
-async function launchBee() {
+async function launchBee(abortController) {
     const configPath = resolve('config.yaml')
-    return runProcess(resolve('bee'), ['start', `--config=${configPath}`], onStdout, onStderr)
+    return runProcess(resolve('bee'), ['start', `--config=${configPath}`], onStdout, onStderr, abortController)
 }
 
 function onStdout(data) {
@@ -67,9 +79,9 @@ function onStderr(data) {
     process.stderr.write(data)
 }
 
-async function runProcess(command, args, onStdout, onStderr) {
+async function runProcess(command, args, onStdout, onStderr, abortController) {
     return new Promise((resolve, reject) => {
-        const subprocess = spawn(command, args)
+        const subprocess = spawn(command, args, { signal: abortController.signal, killSignal: 'SIGINT' })
         subprocess.stdout.on('data', onStdout)
         subprocess.stderr.on('data', onStderr)
         subprocess.on('close', code => {
@@ -79,6 +91,9 @@ async function runProcess(command, args, onStdout, onStderr) {
                 reject(code)
             }
         })
+        subprocess.on('error', error => {
+            reject(error)
+        })
     })
 }
 

src/lifecycle.js

@@ -0,0 +1,31 @@
+const state = {
+    process: null,
+    running: false,
+    abortController: null
+}
+
+const BeeManager = {
+    signalRunning: (abortController, process) => {
+        state.abortController = abortController
+        state.process = process
+        state.running = true
+    },
+    signalStopped: () => {
+        state.running = false
+    },
+    isRunning: () => state.running || (state.abortController && !state.abortController.signal.aborted),
+    stop: () => {
+        if (state.abortController) {
+            state.abortController.abort()
+        }
+    },
+    waitForSigtermToFinish: async () => {
+        if (state.process) {
+            await state.process
+        }
+    }
+}
+
+module.exports = {
+    BeeManager
+}