fixed timeout teardown for electron context (#357)

* fixed timeout teardown for electron context * exit code 1 in case of teardown timeout * electron graceful shutdown on teardown timeout
holepunchto · Oct 17, 2024 · c397985 · c397985
1 parent c05c205
commit c397985
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/gui/gui.js b/gui/gui.js
@@ -477,6 +477,10 @@ class App {
       }
     })
 
+    electron.app.on('app-exit', () => {
+      electron.app.exit()
+    })
+
     const { state } = this
 
     this.starting = this.ipc.start({

diff --git a/lib/api.js b/lib/api.js
@@ -70,7 +70,12 @@ class API {
     await Promise.race([this.#teardowns, countdown])
     if (timedout) {
       console.error(`Max teardown wait reached after ${MAX_TEARDOWN_WAIT} ms. Exiting...`)
-      Bare.exit()
+      if (global.Bare) {
+        Bare.exit()
+      } else {
+        const electron = require('electron')
+        electron.ipcRenderer.send('app-exit') // graceful electron shutdown
+      }
     }
   }