unity-hub-cli 0.7.0 → 0.8.0

package/dist/index.js

@@ -72,9 +72,10 @@ var LaunchProjectUseCase = class {
   }
 };
 var TerminateProjectUseCase = class {
-  constructor(unityProcessReader, unityProcessTerminator) {
+  constructor(unityProcessReader, unityProcessTerminator, unityTempDirectoryCleaner) {
     this.unityProcessReader = unityProcessReader;
     this.unityProcessTerminator = unityProcessTerminator;
+    this.unityTempDirectoryCleaner = unityTempDirectoryCleaner;
   }
   async execute(project) {
     const unityProcess = await this.unityProcessReader.findByProjectPath(project.path);
@@ -84,13 +85,21 @@ var TerminateProjectUseCase = class {
         message: "No Unity process is running for this project."
       };
     }
-    const terminated = await this.unityProcessTerminator.terminate(unityProcess);
-    if (!terminated) {
+    const termination = await this.unityProcessTerminator.terminate(unityProcess);
+    if (!termination.terminated) {
       return {
         terminated: false,
         message: "Failed to terminate the Unity process."
       };
     }
+    if (termination.stage === "sigterm" || termination.stage === "sigkill") {
+      try {
+        await this.unityTempDirectoryCleaner.clean(project.path);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`Failed to clean Temp directory after termination: ${message}`);
+      }
+    }
     return {
       terminated: true
     };
@@ -436,6 +445,8 @@ var PROCESS_LIST_ARGS = ["-axo", "pid=,command=", "-ww"];
 var PROCESS_LIST_COMMAND = "ps";
 var TERMINATE_TIMEOUT_MILLIS = 5e3;
 var TERMINATE_POLL_INTERVAL_MILLIS = 200;
+var GRACEFUL_QUIT_TIMEOUT_MILLIS = 3e3;
+var GRACEFUL_QUIT_POLL_INTERVAL_MILLIS = 200;
 var delay = async (duration) => {
   await new Promise((resolveDelay) => {
     setTimeout(() => {
@@ -535,11 +546,33 @@ var MacUnityProcessReader = class {
 };
 var MacUnityProcessTerminator = class {
   async terminate(unityProcess) {
+    let attemptedGraceful = false;
+    if (process.platform === "darwin") {
+      attemptedGraceful = true;
+      try {
+        const script = [
+          'tell application "System Events"',
+          `  set frontmost of (first process whose unix id is ${unityProcess.pid}) to true`,
+          '  keystroke "q" using {command down}',
+          "end tell"
+        ].join("\n");
+        await execFileAsync2("osascript", ["-e", script]);
+        const deadlineGraceful = Date.now() + GRACEFUL_QUIT_TIMEOUT_MILLIS;
+        while (Date.now() < deadlineGraceful) {
+          await delay(GRACEFUL_QUIT_POLL_INTERVAL_MILLIS);
+          const alive = ensureProcessAlive(unityProcess.pid);
+          if (!alive) {
+            return { terminated: true, stage: "graceful" };
+          }
+        }
+      } catch {
+      }
+    }
     try {
       process.kill(unityProcess.pid, "SIGTERM");
     } catch (error) {
       if (isProcessMissingError(error)) {
-        return false;
+        return { terminated: true, stage: attemptedGraceful ? "graceful" : "sigterm" };
       }
       throw new Error(
         `Failed to terminate the Unity process (PID: ${unityProcess.pid}): ${error instanceof Error ? error.message : String(error)}`
@@ -550,21 +583,22 @@ var MacUnityProcessTerminator = class {
       await delay(TERMINATE_POLL_INTERVAL_MILLIS);
       const alive = ensureProcessAlive(unityProcess.pid);
       if (!alive) {
-        return true;
+        return { terminated: true, stage: "sigterm" };
       }
     }
     try {
       process.kill(unityProcess.pid, "SIGKILL");
     } catch (error) {
       if (isProcessMissingError(error)) {
-        return true;
+        return { terminated: true, stage: "sigkill" };
       }
       throw new Error(
         `Failed to forcefully terminate the Unity process (PID: ${unityProcess.pid}): ${error instanceof Error ? error.message : String(error)}`
       );
     }
     await delay(TERMINATE_POLL_INTERVAL_MILLIS);
-    return !ensureProcessAlive(unityProcess.pid);
+    const aliveAfterKill = ensureProcessAlive(unityProcess.pid);
+    return aliveAfterKill ? { terminated: false } : { terminated: true, stage: "sigkill" };
   }
 };
 
@@ -1194,7 +1228,8 @@ var bootstrap = async () => {
   );
   const terminateProjectUseCase = new TerminateProjectUseCase(
     unityProcessReader,
-    unityProcessTerminator
+    unityProcessTerminator,
+    unityTempDirectoryCleaner
   );
   const useGitRootName = !process2.argv.includes("--no-git-root-name");
   const showBranch = !process2.argv.includes("--hide-branch");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {