unity-hub-cli 0.3.0 → 0.5.0

package/dist/index.js

@@ -6,22 +6,26 @@ import { render } from "ink";
 
 // src/application/usecases.ts
 var ListProjectsUseCase = class {
-  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader) {
+  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader, lockReader) {
     this.unityHubProjectsReader = unityHubProjectsReader;
     this.gitRepositoryInfoReader = gitRepositoryInfoReader;
     this.unityProjectOptionsReader = unityProjectOptionsReader;
+    this.lockReader = lockReader;
   }
   async execute() {
     const projects = await this.unityHubProjectsReader.listProjects();
-    const repositoryInfoResults = await Promise.allSettled(
-      projects.map((project) => this.gitRepositoryInfoReader.readRepositoryInfo(project.path))
-    );
+    const [repositoryInfoResults, lockResults] = await Promise.all([
+      Promise.allSettled(
+        projects.map((project) => this.gitRepositoryInfoReader.readRepositoryInfo(project.path))
+      ),
+      Promise.allSettled(projects.map((project) => this.lockReader.isLocked(project.path)))
+    ]);
     return projects.map((project, index) => {
       const repositoryResult = repositoryInfoResults[index];
-      if (repositoryResult.status === "fulfilled") {
-        return { project, repository: repositoryResult.value ?? void 0 };
-      }
-      return { project };
+      const lockResult = lockResults[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 };
     });
   }
 };
@@ -53,6 +57,41 @@ var LaunchProjectUseCase = class {
     await this.unityHubProjectsReader.updateLastModified(project.path, /* @__PURE__ */ new Date());
   }
 };
+var TerminateProjectUseCase = class {
+  constructor(unityProcessReader, unityProcessTerminator, unityTempDirectoryCleaner) {
+    this.unityProcessReader = unityProcessReader;
+    this.unityProcessTerminator = unityProcessTerminator;
+    this.unityTempDirectoryCleaner = unityTempDirectoryCleaner;
+  }
+  async execute(project) {
+    const unityProcess = await this.unityProcessReader.findByProjectPath(project.path);
+    if (!unityProcess) {
+      return {
+        terminated: false,
+        message: "No Unity process is running for this project."
+      };
+    }
+    const terminated = await this.unityProcessTerminator.terminate(unityProcess);
+    if (!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}`;
+    }
+    return {
+      terminated: true,
+      message: cleanupMessage
+    };
+  }
+};
 
 // src/infrastructure/editor.ts
 import { constants } from "fs";
@@ -66,7 +105,7 @@ var MacEditorPathResolver = class {
     try {
       await access(editorPath, constants.X_OK);
     } catch {
-      throw new Error(`\u5BFE\u5FDC\u3059\u308BUnity Editor\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\uFF08${version.value}\uFF09`);
+      throw new Error(`Unity Editor not found for version ${version.value}.`);
     }
     return editorPath;
   }
@@ -157,7 +196,7 @@ import { spawn } from "child_process";
 var NodeProcessLauncher = class {
   async launch(command, args, options) {
     const detached = options?.detached ?? false;
-    await new Promise((resolve2, reject) => {
+    await new Promise((resolve3, reject) => {
       const child = spawn(command, args, {
         detached,
         stdio: "ignore"
@@ -169,7 +208,7 @@ var NodeProcessLauncher = class {
       const handleSpawn = () => {
         child.off("error", handleError);
         child.unref();
-        resolve2();
+        resolve3();
       };
       child.once("error", handleError);
       child.once("spawn", handleSpawn);
@@ -230,17 +269,17 @@ var UnityHubProjectsReader = class {
       content = await readFile2(HUB_PROJECTS_PATH, "utf8");
     } catch {
       throw new Error(
-        `Unity Hub\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4E00\u89A7\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\uFF08${HUB_PROJECTS_PATH}\uFF09`
+        `Unity Hub project list not found (${HUB_PROJECTS_PATH}).`
       );
     }
     let json;
     try {
       json = JSON.parse(content);
     } catch {
-      throw new Error("Unity Hub\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4E00\u89A7\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\uFF08\u6A29\u9650/\u5F62\u5F0F\u30A8\u30E9\u30FC\uFF09");
+      throw new Error("Unable to read the Unity Hub project list (permissions/format error).");
     }
     if (json.schema_version && json.schema_version !== schemaVersion) {
-      throw new Error(`\u672A\u5BFE\u5FDC\u306Eschema_version\u3067\u3059\uFF08${json.schema_version}\uFF09`);
+      throw new Error(`Unsupported schema_version (${json.schema_version}).`);
     }
     const entries = Object.values(json.data ?? {});
     if (entries.length === 0) {
@@ -255,14 +294,14 @@ var UnityHubProjectsReader = class {
       content = await readFile2(HUB_PROJECTS_PATH, "utf8");
     } catch {
       throw new Error(
-        `Unity Hub\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4E00\u89A7\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\uFF08${HUB_PROJECTS_PATH}\uFF09`
+        `Unity Hub project list not found (${HUB_PROJECTS_PATH}).`
       );
     }
     let json;
     try {
       json = JSON.parse(content);
     } catch {
-      throw new Error("Unity Hub\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4E00\u89A7\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\uFF08\u6A29\u9650/\u5F62\u5F0F\u30A8\u30E9\u30FC\uFF09");
+      throw new Error("Unable to read the Unity Hub project list (permissions/format error).");
     }
     if (!json.data) {
       return;
@@ -365,7 +404,7 @@ var promptYesNoSingleKey = async () => {
   const supportsRaw = isRawModeSupported();
   const previousRaw = supportsRaw ? stdin.isRaw === true : false;
   const wasPaused = stdin.isPaused();
-  return await new Promise((resolve2) => {
+  return await new Promise((resolve3) => {
     const cleanup = () => {
       stdin.removeListener("data", handleData);
       if (wasPaused) {
@@ -388,7 +427,7 @@ var promptYesNoSingleKey = async () => {
       }
       process.stdout.write("\n");
       cleanup();
-      resolve2(result);
+      resolve3(result);
     };
     process.stdout.write(RAW_PROMPT_MESSAGE);
     if (supportsRaw) {
@@ -406,9 +445,9 @@ var promptYesNoLine = async () => {
     console.error("UnityLockfile exists. No interactive console available for confirmation.");
     return false;
   }
-  const confirmed = await new Promise((resolve2) => {
+  const confirmed = await new Promise((resolve3) => {
     prompt.rl.question(RAW_PROMPT_MESSAGE, (answer) => {
-      resolve2(answer.trim() === "y");
+      resolve3(answer.trim() === "y");
     });
   });
   prompt.close();
@@ -441,6 +480,172 @@ var UnityLockChecker = class {
     return "allow";
   }
 };
+var UnityLockStatusReader = class {
+  async isLocked(projectPath) {
+    const lockfilePath = join3(projectPath, "Temp", "UnityLockfile");
+    return await pathExists(lockfilePath);
+  }
+};
+
+// src/infrastructure/unityProcess.ts
+import { execFile } from "child_process";
+import { resolve as resolve2 } from "path";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var UNITY_EXECUTABLE_PATTERN = /Unity\.app\/Contents\/MacOS\/Unity/i;
+var PROJECT_PATH_PATTERN = /-(?:projectPath|projectpath)\s+("[^"]+"|'[^']+'|[^\s"']+)/i;
+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 delay = async (duration) => {
+  await new Promise((resolveDelay) => {
+    setTimeout(() => {
+      resolveDelay();
+    }, duration);
+  });
+};
+var normalizePath = (target) => {
+  const resolved = resolve2(target);
+  if (resolved.endsWith("/")) {
+    return resolved.slice(0, -1);
+  }
+  return resolved;
+};
+var arePathsEqual = (left, right) => {
+  const normalizedLeft = normalizePath(left);
+  const normalizedRight = normalizePath(right);
+  return normalizedLeft.localeCompare(normalizedRight, void 0, { sensitivity: "base" }) === 0;
+};
+var extractProjectPath = (command) => {
+  const match = command.match(PROJECT_PATH_PATTERN);
+  if (!match) {
+    return void 0;
+  }
+  const raw = match[1];
+  if (!raw) {
+    return void 0;
+  }
+  const trimmed = raw.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+    return trimmed.slice(1, -1);
+  }
+  if (trimmed.startsWith("'") && trimmed.endsWith("'")) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+};
+var isUnityMainProcess = (command) => {
+  return UNITY_EXECUTABLE_PATTERN.test(command);
+};
+var isProcessMissingError = (error) => {
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const nodeError = error;
+  return nodeError.code === "ESRCH";
+};
+var ensureProcessAlive = (pid) => {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if (isProcessMissingError(error)) {
+      return false;
+    }
+    throw error;
+  }
+};
+var MacUnityProcessReader = class {
+  async findByProjectPath(projectPath) {
+    const normalizedTarget = normalizePath(projectPath);
+    const processes = await this.listUnityProcesses();
+    return processes.find((candidate) => arePathsEqual(candidate.projectPath, normalizedTarget));
+  }
+  async listUnityProcesses() {
+    let stdout;
+    try {
+      const result = await execFileAsync(PROCESS_LIST_COMMAND, PROCESS_LIST_ARGS);
+      stdout = result.stdout;
+    } catch (error) {
+      throw new Error(`Failed to retrieve Unity process list: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    const lines = stdout.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+    return lines.map((line) => {
+      const match = line.match(/^(\d+)\s+(.*)$/);
+      if (!match) {
+        return void 0;
+      }
+      const pidValue = Number.parseInt(match[1] ?? "", 10);
+      if (!Number.isFinite(pidValue)) {
+        return void 0;
+      }
+      const command = match[2] ?? "";
+      if (!isUnityMainProcess(command)) {
+        return void 0;
+      }
+      const projectArgument = extractProjectPath(command);
+      if (!projectArgument) {
+        return void 0;
+      }
+      return {
+        pid: pidValue,
+        projectPath: normalizePath(projectArgument)
+      };
+    }).filter((process3) => Boolean(process3));
+  }
+};
+var MacUnityProcessTerminator = class {
+  async terminate(unityProcess) {
+    try {
+      process.kill(unityProcess.pid, "SIGTERM");
+    } catch (error) {
+      if (isProcessMissingError(error)) {
+        return false;
+      }
+      throw new Error(
+        `Failed to terminate the Unity process (PID: ${unityProcess.pid}): ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    const deadline = Date.now() + TERMINATE_TIMEOUT_MILLIS;
+    while (Date.now() < deadline) {
+      await delay(TERMINATE_POLL_INTERVAL_MILLIS);
+      const alive = ensureProcessAlive(unityProcess.pid);
+      if (!alive) {
+        return true;
+      }
+    }
+    try {
+      process.kill(unityProcess.pid, "SIGKILL");
+    } catch (error) {
+      if (isProcessMissingError(error)) {
+        return true;
+      }
+      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);
+  }
+};
+
+// src/infrastructure/unityTemp.ts
+import { rm as rm2 } from "fs/promises";
+import { join as join4 } from "path";
+var TEMP_DIRECTORY_NAME = "Temp";
+var UnityTempDirectoryCleaner = class {
+  async clean(projectPath) {
+    const tempDirectoryPath = join4(projectPath, TEMP_DIRECTORY_NAME);
+    try {
+      await rm2(tempDirectoryPath, {
+        recursive: true,
+        force: true
+      });
+    } catch {
+    }
+  }
+};
 
 // src/presentation/App.tsx
 import clipboard from "clipboardy";
@@ -530,10 +735,12 @@ 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 Copy cd path with c \xB7 Exit with Ctrl+C";
+var defaultHintMessage = "Move with arrows or j/k \xB7 Launch with o \xB7 Quit Unity with q \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 shortenHomePath = (targetPath) => {
   if (!homeDirectory) {
     return targetPath;
@@ -553,6 +760,7 @@ var buildCdCommand = (targetPath) => {
 var App = ({
   projects,
   onLaunch,
+  onTerminate,
   useGitRootName = true,
   showBranch = true,
   showPath = true
@@ -563,6 +771,8 @@ var App = ({
   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 linesPerProject = (showBranch ? 1 : 0) + (showPath ? 1 : 0) + 2;
   const sortedProjects = useMemo(() => {
     const fallbackTime = 0;
@@ -736,6 +946,19 @@ var App = ({
     }
     try {
       await onLaunch(project);
+      setLaunchedProjects((previous) => {
+        const next = new Set(previous);
+        next.add(project.id);
+        return next;
+      });
+      setReleasedProjects((previous) => {
+        if (!previous.has(project.id)) {
+          return previous;
+        }
+        const next = new Set(previous);
+        next.delete(project.id);
+        return next;
+      });
       setHint(`Launched: ${project.title}`);
       setTimeout(() => {
         setHint(defaultHintMessage);
@@ -755,6 +978,53 @@ var App = ({
       }, 3e3);
     }
   }, [index, onLaunch, sortedProjects]);
+  const terminateSelected = useCallback(async () => {
+    const projectView = sortedProjects[index];
+    if (!projectView) {
+      setHint("No project to terminate");
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 2e3);
+      return;
+    }
+    try {
+      const result = await onTerminate(projectView.project);
+      if (!result.terminated) {
+        setHint(result.message ?? "No running Unity for this project");
+        setTimeout(() => {
+          setHint(defaultHintMessage);
+        }, 3e3);
+        return;
+      }
+      setHint(`Stopped Unity: ${projectView.project.title}`);
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 3e3);
+      setLaunchedProjects((previous) => {
+        if (!previous.has(projectView.project.id)) {
+          return previous;
+        }
+        const next = new Set(previous);
+        next.delete(projectView.project.id);
+        return next;
+      });
+      setReleasedProjects((previous) => {
+        const next = new Set(previous);
+        next.add(projectView.project.id);
+        return next;
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setHint(`Failed to stop: ${message}`);
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 3e3);
+    }
+  }, [index, onTerminate, sortedProjects]);
+  useEffect(() => {
+    setReleasedProjects(/* @__PURE__ */ new Set());
+    setLaunchedProjects(/* @__PURE__ */ new Set());
+  }, [projects]);
   useInput((input, key) => {
     if (input === "j" || key.downArrow) {
       move(1);
@@ -762,8 +1032,13 @@ var App = ({
     if (input === "k" || key.upArrow) {
       move(-1);
     }
+    if (input === "q") {
+      void terminateSelected();
+      return;
+    }
     if (input === "o") {
       void launchSelected();
+      return;
     }
     if (input === "c") {
       copyProjectPath();
@@ -812,7 +1087,7 @@ var App = ({
     });
   }, [linesPerProject, projects.length, startIndex, visibleProjects]);
   const rows = useMemo(() => {
-    return visibleProjects.map(({ project, repository }, offset) => {
+    return visibleProjects.map(({ project, repository, isLocked }, offset) => {
       const rowIndex = startIndex + offset;
       const isSelected = rowIndex === index;
       const arrow = isSelected ? ">" : " ";
@@ -821,6 +1096,7 @@ 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 baseScrollbarIndex = offset * linesPerProject;
       const titleScrollbar = scrollbarChars[baseScrollbarIndex] ?? " ";
       const branchScrollbar = showBranch ? scrollbarChars[baseScrollbarIndex + 1] ?? " " : " ";
@@ -838,7 +1114,8 @@ var App = ({
               " ",
               versionLabel
             ] }),
-            updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null
+            updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null,
+            activeLock ? /* @__PURE__ */ jsx(Text, { color: LOCK_COLOR, children: `  ${LOCK_LABEL}` }) : null
           ] }),
           showBranch ? /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : BRANCH_COLOR, children: [
             "  ",
@@ -858,9 +1135,19 @@ var App = ({
         ] })
       ] }, project.id);
     });
-  }, [index, scrollbarChars, showBranch, showPath, startIndex, useGitRootName, visibleProjects]);
+  }, [
+    index,
+    launchedProjects,
+    releasedProjects,
+    scrollbarChars,
+    showBranch,
+    showPath,
+    startIndex,
+    useGitRootName,
+    visibleProjects
+  ]);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", children: rows.length === 0 ? /* @__PURE__ */ jsx(Text, { children: "Unity Hub\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F" }) : rows }),
+    /* @__PURE__ */ jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", children: rows.length === 0 ? /* @__PURE__ */ jsx(Text, { children: "No Unity Hub projects were found." }) : rows }),
     /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { children: hint }) })
   ] });
 };
@@ -870,14 +1157,19 @@ import { jsx as jsx2 } from "react/jsx-runtime";
 var bootstrap = async () => {
   const unityHubReader = new UnityHubProjectsReader();
   const gitRepositoryInfoReader = new GitRepositoryInfoReader();
+  const lockStatusReader = new UnityLockStatusReader();
   const listProjectsUseCase = new ListProjectsUseCase(
     unityHubReader,
     gitRepositoryInfoReader,
-    unityHubReader
+    unityHubReader,
+    lockStatusReader
   );
   const editorPathResolver = new MacEditorPathResolver();
   const processLauncher = new NodeProcessLauncher();
   const lockChecker = new UnityLockChecker();
+  const unityProcessReader = new MacUnityProcessReader();
+  const unityProcessTerminator = new MacUnityProcessTerminator();
+  const unityTempDirectoryCleaner = new UnityTempDirectoryCleaner();
   const launchProjectUseCase = new LaunchProjectUseCase(
     editorPathResolver,
     processLauncher,
@@ -885,6 +1177,11 @@ var bootstrap = async () => {
     unityHubReader,
     lockChecker
   );
+  const terminateProjectUseCase = new TerminateProjectUseCase(
+    unityProcessReader,
+    unityProcessTerminator,
+    unityTempDirectoryCleaner
+  );
   const useGitRootName = !process2.argv.includes("--no-git-root-name");
   const showBranch = !process2.argv.includes("--hide-branch");
   const showPath = !process2.argv.includes("--hide-path");
@@ -896,6 +1193,7 @@ var bootstrap = async () => {
         {
           projects,
           onLaunch: (project) => launchProjectUseCase.execute(project),
+          onTerminate: (project) => terminateProjectUseCase.execute(project),
           useGitRootName,
           showBranch,
           showPath

package/package.json

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