System Tray with basic functions, app no longer quits on close must u…

…se tray

.github/actions/build/windows/app/action.yml

@@ -36,7 +36,7 @@ runs:
         DEBUG: electron-forge:*
         PUBLISH: ${{ inputs.sign-and-publish }}
         GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
-      run: npm run ${{inputs.sign-and-publish == true && 'publish' || 'make'}}
+      run: npm run ${{inputs.sign-and-publish == true && 'publish' || 'make'}} -- --targets=@electron-forge/maker-zip
     - name: Print SignLogs
       if: ${{inputs.sign-and-publish == true && always()}} 
       continue-on-error: true 

src/main.ts

@@ -2,6 +2,7 @@ import { app, BrowserWindow } from 'electron';
 import path from 'path';
 import net from 'net';
 import { spawn, ChildProcess } from 'child_process';
+import { SetupTray } from './tray';
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 import('electron-squirrel-startup').then(ess => {
@@ -35,6 +36,12 @@ const createWindow = () => {
   // Load the UI from the Python server's URL
   mainWindow.loadURL('http://localhost:8188/');
 
+  SetupTray(mainWindow);
+
+  mainWindow.on('close' , (e) => {
+    e.preventDefault();
+    mainWindow.hide();
+  })
   // Open the DevTools.
   mainWindow.webContents.openDevTools();
 };
@@ -133,22 +140,46 @@ app.on('ready', async () => {
 });
 
 const killPythonServer = () => {
-  if (pythonProcess) {
-    pythonProcess.kill();
-    pythonProcess = null;
-  }
+  console.log('Python server:', pythonProcess);
+  return new Promise<void>(async(resolve, reject) => {
+    if (pythonProcess) {
+      try { 
+        pythonProcess.kill();
+        setTimeout(() => {
+          resolve();
+        }, 5000);
+        while (pythonProcess.exitCode == null)
+        {}
+        resolve(); 
+      }
+      catch(error)
+      {
+        console.error(error);
+        reject(error);
+      } 
+    }
+    else
+    {
+      resolve();
+    }
+  })
 };
 
-app.on('will-quit', () => {
-  killPythonServer();
-});
+app.on('before-quit', async () => {
+  await killPythonServer();
+  app.exit();
+})
+
+app.on('quit', () => {
+  app.exit();
+})
 
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
-    app.quit();
+    //app.quit();
   }
 });
 

src/tray.ts

@@ -0,0 +1,38 @@
+import { Tray, Menu, BrowserWindow, app } from "electron";
+import path from 'path';
+
+export function SetupTray(mainView: BrowserWindow): Tray {
+
+    const trayImage = path.join(process.resourcesPath, 'UI', 'Comfy_Logo_x32.png');
+    let tray = new Tray(trayImage);
+
+    tray.setTitle('ComfyUI');
+    tray.setToolTip('ComfyUI - Server is running');
+
+    const contextMenu = Menu.buildFromTemplate([
+    {
+        label: 'Show Comfy Window',
+        click: function () {
+            mainView.show();
+            if (process.platform === 'darwin') {
+                app.dock.show();
+            }
+        },
+    },
+    {
+        label: 'Quit Comfy',
+        click() {
+            app.quit();
+        },
+    },
+    {
+        label: 'Hide',
+        click() {
+            mainView.hide();
+        }
+    }]);
+
+    tray.setContextMenu(contextMenu);
+
+    return tray;
+}