fix: multiple fixes for excessive cpu consumption

The tray menu was not cleaning up properly.

Author: starpit

package-lock.json

@@ -25,11 +25,10 @@ import logAggregator from "./log-aggregator"
 
 export default function tasks(profile: string, createWindow: CreateWindowFunction): MenuItemConstructorOptions[] {
   return [
-    boot(profile, createWindow),
     shutdown(profile, createWindow),
     {
       label: "Advanced",
-      submenu: [...section("Log Aggregator", logAggregator(profile, createWindow))],
+      submenu: [boot(profile, createWindow), ...section("Log Aggregator", logAggregator(profile, createWindow))],
     },
   ]
 }

plugins/plugin-codeflare/src/tray/menus/profiles/tasks.ts

@@ -47,18 +47,28 @@ export default class ProfileActiveRunWatcher {
   private static async initWatcher(profile: string) {
     const guidebook = "ml/ray/cluster/connect"
     try {
+      const { app } = await import("electron")
+      const registerCleanup = ({ cleanExit }: { cleanExit: () => void }) => {
+        const onExit = () => cleanExit()
+        process.on("exit", onExit)
+        process.on("SIGINT", onExit) // catch ctrl-c
+        process.on("SIGTERM", onExit) // catch kill
+
+        // use the electron API to register our onExit handler
+        app.on("before-quit", onExit)
+      }
+
       const resp = await cli(["madwizard", "guide", guidebook], undefined, {
         profile,
         bump: false, // don't bump the lastUsedTime of the profile
         clean: false, // don't kill the port-forward subprocess! we'll manage that
         interactive: false,
         store: process.env.GUIDEBOOK_STORE,
+        onBeforeRun: registerCleanup, // use this hook to register our electron-based cleanup hook
       })
 
       if (resp) {
-        if (resp.cleanExit) {
-          process.on("exit", () => resp.cleanExit())
-        }
+        registerCleanup(resp)
 
         if (resp.env && typeof resp.env.RAY_ADDRESS === "string") {
           return resp.env.RAY_ADDRESS

plugins/plugin-codeflare/src/tray/watchers/profile/active-runs.ts

@@ -110,6 +110,10 @@ export default class ProfileStatusWatcher {
     process.on("SIGINT", onExit) // catch ctrl-c
     process.on("SIGTERM", onExit) // catch kill
 
+    // use the electron API to register our onExit handler
+    const { app } = await import("electron")
+    app.on("before-quit", onExit)
+
     job.on("error", () => {
       Debug("codeflare")("Watcher error", profile)
       this.headReadiness = "error"

plugins/plugin-codeflare/src/tray/watchers/profile/status.ts

@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "madwizard": "^1.8.5",
-    "@guidebooks/store": "^0.18.0"
+    "madwizard": "^1.9.0",
+    "@guidebooks/store": "^0.18.1"
   }
 }