Merge branch 'main' into custom-window

package.json

@@ -3,15 +3,15 @@
   "productName": "ComfyUI",
   "repository": "github:comfy-org/electron",
   "copyright": "Copyright © 2024 Comfy Org",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "homepage": "https://comfy.org",
   "description": "The best modular GUI to run AI diffusion models.",
   "main": ".vite/build/main.cjs",
   "packageManager": "[email protected]",
   "type": "module",
   "config": {
     "frontendVersion": "1.6.6",
-    "comfyVersion": "0.3.9",
+    "comfyVersion": "0.3.10",
     "managerCommit": "b4e52e65ec87978fc6294e82d55e1b91c5b02d55",
     "uvVersion": "0.5.8"
   },
@@ -113,4 +113,4 @@
   "lint-staged": {
     "./**/*.{js,ts,tsx}": "prettier --write"
   }
-}
+}

src/install/installationManager.ts

@@ -101,7 +101,9 @@ export class InstallationManager {
       useDesktopConfig().set('migrateCustomNodesFrom', installWizard.migrationSource);
     }
 
-    return new ComfyInstallation('installed', installWizard.basePath);
+    const installation = new ComfyInstallation('installed', installWizard.basePath);
+    installation.setState('installed');
+    return installation;
   }
 
   /**

src/virtualEnvironment.ts

@@ -50,7 +50,7 @@ export class VirtualEnvironment {
     return this.uvPty;
   }
 
-  constructor(venvPath: string, selectedDevice: TorchDeviceType | undefined, pythonVersion: string = '3.12.4') {
+  constructor(venvPath: string, selectedDevice: TorchDeviceType | undefined, pythonVersion: string = '3.12.8') {
     this.venvRootPath = venvPath;
     this.pythonVersion = pythonVersion;
     this.selectedDevice = selectedDevice;
@@ -108,17 +108,8 @@ export class VirtualEnvironment {
     try {
       await this.createEnvironment(callbacks);
     } finally {
-      if (this.uvPty) {
-        // If we have a pty instance then we need to kill it on a delay
-        // else you may get an EPIPE error on reading the stream if it is
-        // reading/writing as you kill it
-        const pty = this.uvPty;
-        this.uvPty = undefined;
-        pty.pause();
-        setTimeout(() => {
-          this.uvPty?.kill();
-        }, 100);
-      }
+      const pid = this.uvPty?.pid;
+      if (pid) process.kill(pid);
     }
   }