unity-hub-cli 0.6.1 → 0.8.0

package/dist/index.js

@@ -6,28 +6,42 @@ import { render } from "ink";
 
 // src/application/usecases.ts
 var ListProjectsUseCase = class {
-  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader, lockReader) {
+  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader, lockReader, unityProcessReader) {
     this.unityHubProjectsReader = unityHubProjectsReader;
     this.gitRepositoryInfoReader = gitRepositoryInfoReader;
     this.unityProjectOptionsReader = unityProjectOptionsReader;
     this.lockReader = lockReader;
+    this.unityProcessReader = unityProcessReader;
   }
   async execute() {
     const projects = await this.unityHubProjectsReader.listProjects();
-    const [repositoryInfoResults, lockResults] = await Promise.all([
+    const [repositoryInfoResults, lockResults, processResults] = await Promise.all([
       Promise.allSettled(
         projects.map((project) => this.gitRepositoryInfoReader.readRepositoryInfo(project.path))
       ),
-      Promise.allSettled(projects.map((project) => this.lockReader.isLocked(project.path)))
+      Promise.allSettled(projects.map((project) => this.lockReader.isLocked(project.path))),
+      Promise.allSettled(projects.map((project) => this.unityProcessReader.findByProjectPath(project.path)))
     ]);
     return projects.map((project, index) => {
       const repositoryResult = repositoryInfoResults[index];
       const lockResult = lockResults[index];
+      const processResult = processResults[index];
       const repository = repositoryResult.status === "fulfilled" ? repositoryResult.value ?? void 0 : void 0;
       const isLocked = lockResult.status === "fulfilled" ? Boolean(lockResult.value) : false;
-      return { project, repository, isLocked };
+      const hasRunningProcess = processResult.status === "fulfilled" ? Boolean(processResult.value) : false;
+      const launchStatus = this.determineLaunchStatus(hasRunningProcess, isLocked);
+      return { project, repository, isLocked, launchStatus };
     });
   }
+  determineLaunchStatus(hasRunningProcess, isLocked) {
+    if (hasRunningProcess) {
+      return "running";
+    }
+    if (isLocked) {
+      return "crashed";
+    }
+    return "idle";
+  }
 };
 var LaunchCancelledError = class extends Error {
   constructor() {
@@ -71,24 +85,23 @@ 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."
       };
     }
-    let cleanupMessage = void 0;
-    try {
-      await this.unityTempDirectoryCleaner.clean(project.path);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      console.error("Failed to clean Unity Temp directory:", message);
-      cleanupMessage = `Unity terminated, but failed to clean Temp: ${message}`;
+    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,
-      message: cleanupMessage
+      terminated: true
     };
   }
 };
@@ -348,117 +361,14 @@ var UnityHubProjectsReader = class {
 
 // src/infrastructure/unityLock.ts
 import { execFile } from "child_process";
-import { constants as constants2, createReadStream, createWriteStream } from "fs";
+import { constants as constants2 } from "fs";
 import { access as access2, rm } from "fs/promises";
 import { join as join3 } from "path";
-import readline from "readline";
 import { promisify } from "util";
-var RAW_PROMPT_MESSAGE = "Delete UnityLockfile and continue? Type 'y' to continue; anything else aborts: ";
 var execFileAsync = promisify(execFile);
 var buildBringToFrontScript = (pid) => {
   return `tell application "System Events" to set frontmost of (first process whose unix id is ${pid}) to true`;
 };
-var isRawModeSupported = () => {
-  const stdin = process.stdin;
-  return Boolean(stdin?.isTTY && typeof stdin.setRawMode === "function" && process.stdout.isTTY);
-};
-var createPromptInterface = () => {
-  if (process.stdin.isTTY && process.stdout.isTTY) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const close = () => rl.close();
-    return { rl, close };
-  }
-  try {
-    if (process.platform === "win32") {
-      const inCandidates = ["\\\\.\\CONIN$", "CONIN$"];
-      const outCandidates = ["\\\\.\\CONOUT$", "CONOUT$"];
-      for (const inPath of inCandidates) {
-        for (const outPath of outCandidates) {
-          try {
-            const input = createReadStream(inPath);
-            const output = createWriteStream(outPath);
-            const rl = readline.createInterface({ input, output });
-            const close = () => {
-              rl.close();
-              input.destroy();
-              output.end();
-            };
-            return { rl, close };
-          } catch {
-            continue;
-          }
-        }
-      }
-    } else {
-      const input = createReadStream("/dev/tty");
-      const output = createWriteStream("/dev/tty");
-      const rl = readline.createInterface({ input, output });
-      const close = () => {
-        rl.close();
-        input.destroy();
-        output.end();
-      };
-      return { rl, close };
-    }
-  } catch {
-    return void 0;
-  }
-  return void 0;
-};
-var promptYesNoSingleKey = async () => {
-  const stdin = process.stdin;
-  const supportsRaw = isRawModeSupported();
-  const previousRaw = supportsRaw ? stdin.isRaw === true : false;
-  const wasPaused = stdin.isPaused();
-  return await new Promise((resolve3) => {
-    const cleanup = () => {
-      stdin.removeListener("data", handleData);
-      if (wasPaused) {
-        stdin.pause();
-      }
-      if (supportsRaw) {
-        stdin.setRawMode(previousRaw);
-      }
-    };
-    const handleData = (data) => {
-      const char = data.toString();
-      const firstByte = data[0] ?? 0;
-      let result = false;
-      if (char === "y") {
-        result = true;
-      } else if (char === "n" || char === "N" || firstByte === 3 || firstByte === 27 || firstByte === 13) {
-        result = false;
-      } else {
-        result = false;
-      }
-      process.stdout.write("\n");
-      cleanup();
-      resolve3(result);
-    };
-    process.stdout.write(RAW_PROMPT_MESSAGE);
-    if (supportsRaw) {
-      stdin.setRawMode(true);
-    }
-    if (wasPaused) {
-      stdin.resume();
-    }
-    stdin.once("data", handleData);
-  });
-};
-var promptYesNoLine = async () => {
-  const prompt = createPromptInterface();
-  if (!prompt) {
-    console.error("UnityLockfile exists. No interactive console available for confirmation.");
-    return false;
-  }
-  const confirmed = await new Promise((resolve3) => {
-    prompt.rl.question(RAW_PROMPT_MESSAGE, (answer) => {
-      resolve3(answer.trim() === "y");
-    });
-  });
-  prompt.close();
-  return confirmed;
-};
 var pathExists = async (target) => {
   try {
     await access2(target, constants2.F_OK);
@@ -468,8 +378,9 @@ var pathExists = async (target) => {
   }
 };
 var UnityLockChecker = class {
-  constructor(unityProcessReader) {
+  constructor(unityProcessReader, tempDirectoryCleaner) {
     this.unityProcessReader = unityProcessReader;
+    this.tempDirectoryCleaner = tempDirectoryCleaner;
   }
   async check(projectPath) {
     const activeProcess = await this.unityProcessReader.findByProjectPath(projectPath);
@@ -485,15 +396,22 @@ var UnityLockChecker = class {
     if (!hasLockfile) {
       return "allow";
     }
-    console.log(`UnityLockfile found: ${lockfilePath}`);
-    console.log("Another Unity process may be using this project.");
-    const confirmed = isRawModeSupported() ? await promptYesNoSingleKey() : await promptYesNoLine();
-    if (!confirmed) {
-      console.log("Aborted by user.");
-      return "skip";
+    console.log(`UnityLockfile found without active Unity process: ${lockfilePath}`);
+    console.log("Assuming previous crash. Cleaning Temp directory and continuing launch.");
+    try {
+      await this.tempDirectoryCleaner.clean(projectPath);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`Failed to clean Temp directory: ${message}`);
     }
-    await rm(lockfilePath, { force: true });
-    console.log("Deleted UnityLockfile. Continuing launch.");
+    try {
+      await rm(lockfilePath, { force: true });
+      console.log("Deleted UnityLockfile.");
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`Failed to delete UnityLockfile: ${message}`);
+    }
+    console.log("Continuing launch.");
     return "allow";
   }
   async bringUnityToFront(pid) {
@@ -527,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(() => {
@@ -626,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)}`
@@ -641,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" };
   }
 };
 
@@ -764,12 +707,16 @@ var formatUpdatedText = (lastModified) => {
 var homeDirectory = process.env.HOME ?? "";
 var homePrefix = homeDirectory ? `${homeDirectory}/` : "";
 var minimumVisibleProjectCount = 4;
-var defaultHintMessage = "Move with arrows or j/k \xB7 Launch with o \xB7 Quit Unity with q \xB7 Copy cd path with c";
+var defaultHintMessage = "Move with arrows or j/k \xB7 Launch with o \xB7 Quit Unity with q \xB7 Refresh with r \xB7 Copy cd path with c";
 var PROJECT_COLOR = "#abd8e7";
 var BRANCH_COLOR = "#e3839c";
 var PATH_COLOR = "#719bd8";
 var LOCK_COLOR = "yellow";
-var LOCK_LABEL = "[running]";
+var STATUS_LABELS = {
+  idle: "",
+  running: "[running]",
+  crashed: "[crash]"
+};
 var shortenHomePath = (targetPath) => {
   if (!homeDirectory) {
     return targetPath;
@@ -790,18 +737,21 @@ var App = ({
   projects,
   onLaunch,
   onTerminate,
+  onRefresh,
   useGitRootName = true,
   showBranch = true,
   showPath = true
 }) => {
   const { exit } = useApp();
   const { stdout } = useStdout();
+  const [projectViews, setProjectViews] = useState(projects);
   const [visibleCount, setVisibleCount] = useState(minimumVisibleProjectCount);
   const [index, setIndex] = useState(0);
   const [hint, setHint] = useState(defaultHintMessage);
   const [windowStart, setWindowStart] = useState(0);
   const [releasedProjects, setReleasedProjects] = useState(/* @__PURE__ */ new Set());
   const [launchedProjects, setLaunchedProjects] = useState(/* @__PURE__ */ new Set());
+  const [isRefreshing, setIsRefreshing] = useState(false);
   const linesPerProject = (showBranch ? 1 : 0) + (showPath ? 1 : 0) + 2;
   const sortedProjects = useMemo(() => {
     const fallbackTime = 0;
@@ -815,7 +765,7 @@ var App = ({
       return view.project.title.toLocaleLowerCase();
     };
     const toTieBreaker = (view) => view.project.path.toLocaleLowerCase();
-    return [...projects].sort((a, b) => {
+    return [...projectViews].sort((a, b) => {
       if (a.project.favorite !== b.project.favorite) {
         return a.project.favorite ? -1 : 1;
       }
@@ -831,7 +781,7 @@ var App = ({
       }
       return keyA.localeCompare(keyB);
     });
-  }, [projects, useGitRootName]);
+  }, [projectViews, useGitRootName]);
   useEffect(() => {
     const handleSigint = () => {
       exit();
@@ -1050,9 +1000,63 @@ var App = ({
     }
   }, [index, onTerminate, sortedProjects]);
   useEffect(() => {
+    setProjectViews(projects);
     setReleasedProjects(/* @__PURE__ */ new Set());
     setLaunchedProjects(/* @__PURE__ */ new Set());
   }, [projects]);
+  const refreshProjects = useCallback(async () => {
+    if (!onRefresh) {
+      setHint("Refresh not available");
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 2e3);
+      return;
+    }
+    if (isRefreshing) {
+      setHint("Already refreshing");
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 2e3);
+      return;
+    }
+    setIsRefreshing(true);
+    setHint("Refreshing projects...");
+    try {
+      const updatedProjects = await onRefresh();
+      setProjectViews(updatedProjects);
+      setReleasedProjects(/* @__PURE__ */ new Set());
+      setLaunchedProjects(/* @__PURE__ */ new Set());
+      setIndex((previousIndex) => {
+        if (updatedProjects.length === 0) {
+          return 0;
+        }
+        const previousProject = sortedProjects[previousIndex]?.project;
+        if (!previousProject) {
+          return Math.min(previousIndex, updatedProjects.length - 1);
+        }
+        const nextIndex = updatedProjects.findIndex(
+          (candidate) => candidate.project.id === previousProject.id
+        );
+        if (nextIndex === -1) {
+          return Math.min(previousIndex, updatedProjects.length - 1);
+        }
+        return nextIndex;
+      });
+      setWindowStart(0);
+      setHint("Project list refreshed");
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 2e3);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setHint(`Failed to refresh: ${message}`);
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 3e3);
+    } finally {
+      setIsRefreshing(false);
+    }
+  }, [isRefreshing, onRefresh, sortedProjects]);
   useInput((input, key) => {
     if (input === "j" || key.downArrow) {
       move(1);
@@ -1068,6 +1072,10 @@ var App = ({
       void launchSelected();
       return;
     }
+    if (input === "r") {
+      void refreshProjects();
+      return;
+    }
     if (input === "c") {
       copyProjectPath();
     }
@@ -1088,7 +1096,7 @@ var App = ({
     };
   }, [limit, sortedProjects, windowStart]);
   const scrollbarChars = useMemo(() => {
-    const totalProjects = projects.length;
+    const totalProjects = projectViews.length;
     const totalLines = totalProjects * linesPerProject;
     const windowProjects = visibleProjects.length;
     const visibleLines = windowProjects * linesPerProject;
@@ -1113,9 +1121,9 @@ var App = ({
       }
       return "|";
     });
-  }, [linesPerProject, projects.length, startIndex, visibleProjects]);
+  }, [linesPerProject, projectViews.length, startIndex, visibleProjects]);
   const rows = useMemo(() => {
-    return visibleProjects.map(({ project, repository, isLocked }, offset) => {
+    return visibleProjects.map(({ project, repository, launchStatus }, offset) => {
       const rowIndex = startIndex + offset;
       const isSelected = rowIndex === index;
       const arrow = isSelected ? ">" : " ";
@@ -1124,12 +1132,24 @@ var App = ({
       const updatedText = formatUpdatedText(project.lastModified);
       const pathLine = shortenHomePath(project.path);
       const branchLine = formatBranch(repository?.branch);
-      const activeLock = isLocked && !releasedProjects.has(project.id) || launchedProjects.has(project.id);
+      const hasReleasedLock = releasedProjects.has(project.id);
+      const isLocallyLaunched = launchedProjects.has(project.id);
+      const displayStatus = (() => {
+        if (isLocallyLaunched) {
+          return "running";
+        }
+        if (hasReleasedLock) {
+          return "idle";
+        }
+        return launchStatus;
+      })();
       const baseScrollbarIndex = offset * linesPerProject;
       const titleScrollbar = scrollbarChars[baseScrollbarIndex] ?? " ";
       const branchScrollbar = showBranch ? scrollbarChars[baseScrollbarIndex + 1] ?? " " : " ";
       const pathScrollbar = showPath ? scrollbarChars[baseScrollbarIndex + 1 + (showBranch ? 1 : 0)] ?? " " : " ";
       const spacerScrollbar = scrollbarChars[baseScrollbarIndex + linesPerProject - 1] ?? " ";
+      const statusLabel = STATUS_LABELS[displayStatus];
+      const statusColor = displayStatus === "running" ? LOCK_COLOR : displayStatus === "crashed" ? "red" : void 0;
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
         /* @__PURE__ */ jsxs(Box, { flexGrow: 1, flexDirection: "column", children: [
           /* @__PURE__ */ jsxs(Text, { children: [
@@ -1143,7 +1163,7 @@ var App = ({
               versionLabel
             ] }),
             updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null,
-            activeLock ? /* @__PURE__ */ jsx(Text, { color: LOCK_COLOR, children: `  ${LOCK_LABEL}` }) : null
+            statusLabel && statusColor ? /* @__PURE__ */ jsx(Text, { color: statusColor, children: `  ${statusLabel}` }) : null
           ] }),
           showBranch ? /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : BRANCH_COLOR, children: [
             "  ",
@@ -1187,17 +1207,18 @@ var bootstrap = async () => {
   const gitRepositoryInfoReader = new GitRepositoryInfoReader();
   const lockStatusReader = new UnityLockStatusReader();
   const unityProcessReader = new MacUnityProcessReader();
+  const unityTempDirectoryCleaner = new UnityTempDirectoryCleaner();
   const listProjectsUseCase = new ListProjectsUseCase(
     unityHubReader,
     gitRepositoryInfoReader,
     unityHubReader,
-    lockStatusReader
+    lockStatusReader,
+    unityProcessReader
   );
   const editorPathResolver = new MacEditorPathResolver();
   const processLauncher = new NodeProcessLauncher();
-  const lockChecker = new UnityLockChecker(unityProcessReader);
+  const lockChecker = new UnityLockChecker(unityProcessReader, unityTempDirectoryCleaner);
   const unityProcessTerminator = new MacUnityProcessTerminator();
-  const unityTempDirectoryCleaner = new UnityTempDirectoryCleaner();
   const launchProjectUseCase = new LaunchProjectUseCase(
     editorPathResolver,
     processLauncher,
@@ -1222,6 +1243,7 @@ var bootstrap = async () => {
           projects,
           onLaunch: (project) => launchProjectUseCase.execute(project),
           onTerminate: (project) => terminateProjectUseCase.execute(project),
+          onRefresh: () => listProjectsUseCase.execute(),
           useGitRootName,
           showBranch,
           showPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.6.1",
+  "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": {