unity-hub-cli 0.21.0 → 0.22.0

package/dist/index.js

@@ -4,7 +4,7 @@
 import { execSync, spawnSync } from "child_process";
 import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { dirname as dirname2, join as join9 } from "path";
+import { dirname as dirname2, join as join7 } from "path";
 import process3 from "process";
 import { createInterface as createInterface2 } from "readline";
 import { fileURLToPath } from "url";
@@ -12,6 +12,10 @@ import chalk from "chalk";
 import { render } from "ink";
 
 // src/application/usecases.ts
+import {
+  launch as launchUnity,
+  updateLastModifiedIfExists
+} from "launch-unity";
 var ListProjectsUseCase = class {
   constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader, lockReader, unityProcessReader) {
     this.unityHubProjectsReader = unityHubProjectsReader;
@@ -56,12 +60,18 @@ var LaunchCancelledError = class extends Error {
     this.name = "LaunchCancelledError";
   }
 };
+async function launchUnitySilently(opts) {
+  const originalLog = console.log;
+  console.log = () => {
+  };
+  try {
+    await launchUnity(opts);
+  } finally {
+    console.log = originalLog;
+  }
+}
 var LaunchProjectUseCase = class {
-  constructor(editorPathResolver, processLauncher, unityHubProjectsReader, unityProjectOptionsReader, unityProcessLockChecker) {
-    this.editorPathResolver = editorPathResolver;
-    this.processLauncher = processLauncher;
-    this.unityHubProjectsReader = unityHubProjectsReader;
-    this.unityProjectOptionsReader = unityProjectOptionsReader;
+  constructor(unityProcessLockChecker) {
     this.unityProcessLockChecker = unityProcessLockChecker;
   }
   async execute(project) {
@@ -69,13 +79,12 @@ var LaunchProjectUseCase = class {
     if (lockDecision === "skip") {
       throw new LaunchCancelledError();
     }
-    const editorPath = await this.editorPathResolver.resolve(project.version);
-    const extraArgs = await this.unityProjectOptionsReader.readCliArgs(project.path);
-    const launchArgs = ["-projectPath", project.path, ...extraArgs];
-    await this.processLauncher.launch(editorPath, launchArgs, {
-      detached: true
+    await launchUnitySilently({
+      projectPath: project.path,
+      unityArgs: [],
+      unityVersion: project.version.value
     });
-    await this.unityHubProjectsReader.updateLastModified(project.path, /* @__PURE__ */ new Date());
+    await updateLastModifiedIfExists(project.path, /* @__PURE__ */ new Date());
   }
 };
 var TerminateProjectUseCase = class {
@@ -215,63 +224,11 @@ var LaunchEditorOnlyUseCase = class {
   }
 };
 
-// src/infrastructure/editor.ts
-import { constants } from "fs";
-import { access } from "fs/promises";
-import { join } from "path";
-var UNITY_EDITOR_BASE = "/Applications/Unity/Hub/Editor";
-var UNITY_BINARY_PATH = "Unity.app/Contents/MacOS/Unity";
-var MacEditorPathResolver = class {
-  async resolve(version) {
-    const editorPath = join(UNITY_EDITOR_BASE, version.value, UNITY_BINARY_PATH);
-    try {
-      await access(editorPath, constants.X_OK);
-    } catch {
-      throw new Error(`Unity Editor not found for version ${version.value}.`);
-    }
-    return editorPath;
-  }
-};
-
-// src/infrastructure/editor.win.ts
-import { constants as constants2 } from "fs";
-import { access as access2 } from "fs/promises";
-import { join as join2 } from "path";
-var buildCandidateBases = () => {
-  const candidates = [];
-  const programFiles = process.env.PROGRAMFILES ?? "C:\\Program Files";
-  const programW6432 = process.env.ProgramW6432 ?? process.env.PROGRAMFILES;
-  const localAppData = process.env.LOCALAPPDATA;
-  candidates.push(join2(programFiles, "Unity", "Hub", "Editor"));
-  if (programW6432) {
-    candidates.push(join2(programW6432, "Unity", "Hub", "Editor"));
-  }
-  if (localAppData) {
-    candidates.push(join2(localAppData, "Unity", "Hub", "Editor"));
-  }
-  return Array.from(new Set(candidates));
-};
-var WinEditorPathResolver = class {
-  async resolve(version) {
-    const tried = [];
-    for (const base of buildCandidateBases()) {
-      const candidate = join2(base, version.value, "Editor", "Unity.exe");
-      try {
-        await access2(candidate, constants2.F_OK);
-        return candidate;
-      } catch {
-        tried.push(candidate);
-      }
-    }
-    throw new Error(`Unity Editor not found for version ${version.value}. Tried: ${tried.join(" , ")}`);
-  }
-};
-
 // src/infrastructure/externalEditor.ts
 import { execFile } from "child_process";
-import { constants as constants3, existsSync } from "fs";
-import { access as access3 } from "fs/promises";
-import { basename, join as join3 } from "path";
+import { constants, existsSync } from "fs";
+import { access } from "fs/promises";
+import { basename, join } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var PLIST_DOMAIN = "com.unity3d.UnityEditor5.x";
@@ -293,7 +250,7 @@ var MacExternalEditorPathReader = class {
       return { status: "not_configured" };
     }
     try {
-      await access3(configuredPath, constants3.F_OK);
+      await access(configuredPath, constants.F_OK);
     } catch {
       return { status: "not_found", configuredPath };
     }
@@ -318,7 +275,7 @@ var MacExternalEditorLauncher = class {
     let targetPath = projectRoot;
     if (prefersSlnFile(editorPath)) {
       const projectName = basename(projectRoot);
-      const slnFilePath = join3(projectRoot, `${projectName}.sln`);
+      const slnFilePath = join(projectRoot, `${projectName}.sln`);
       if (existsSync(slnFilePath)) {
         targetPath = slnFilePath;
       }
@@ -329,9 +286,9 @@ var MacExternalEditorLauncher = class {
 
 // src/infrastructure/externalEditor.win.ts
 import { execFile as execFile2, spawn } from "child_process";
-import { constants as constants4, existsSync as existsSync2 } from "fs";
-import { access as access4 } from "fs/promises";
-import { basename as basename2, join as join4 } from "path";
+import { constants as constants2, existsSync as existsSync2 } from "fs";
+import { access as access2 } from "fs/promises";
+import { basename as basename2, join as join2 } from "path";
 import { promisify as promisify2 } from "util";
 
 // src/presentation/utils/path.ts
@@ -429,7 +386,7 @@ var WinExternalEditorPathReader = class {
       return { status: "not_configured" };
     }
     try {
-      await access4(configuredPath, constants4.F_OK);
+      await access2(configuredPath, constants2.F_OK);
     } catch {
       return { status: "not_found", configuredPath };
     }
@@ -454,7 +411,7 @@ var WinExternalEditorLauncher = class {
     let targetPath = projectRoot;
     if (prefersSlnFile2(editorPath)) {
       const projectName = basename2(projectRoot);
-      const slnFilePath = join4(projectRoot, `${projectName}.sln`);
+      const slnFilePath = join2(projectRoot, `${projectName}.sln`);
       if (existsSync2(slnFilePath)) {
         targetPath = slnFilePath;
       }
@@ -482,7 +439,7 @@ var WinExternalEditorLauncher = class {
 
 // src/infrastructure/git.ts
 import { readFile, stat } from "fs/promises";
-import { dirname, join as join5, resolve } from "path";
+import { dirname, join as join3, resolve } from "path";
 var HEAD_FILE = "HEAD";
 var GIT_DIR = ".git";
 var MAX_ASCENT = 50;
@@ -505,7 +462,7 @@ var isFile = async (path) => {
 var findGitDir = async (start) => {
   let current = resolve(start);
   for (let depth = 0; depth < MAX_ASCENT; depth += 1) {
-    const candidate = join5(current, GIT_DIR);
+    const candidate = join3(current, GIT_DIR);
     if (await isDirectory(candidate)) {
       return candidate;
     }
@@ -549,7 +506,7 @@ var GitRepositoryInfoReader = class {
       return void 0;
     }
     try {
-      const headPath = join5(gitDir, HEAD_FILE);
+      const headPath = join3(gitDir, HEAD_FILE);
       const content = await readFile(headPath, "utf8");
       const branch = parseHead(content);
       const root = dirname(gitDir);
@@ -560,32 +517,6 @@ var GitRepositoryInfoReader = class {
   }
 };
 
-// src/infrastructure/process.ts
-import { spawn as spawn2 } from "child_process";
-var NodeProcessLauncher = class {
-  async launch(command, args, options) {
-    const detached = options?.detached ?? false;
-    await new Promise((resolve4, reject) => {
-      const child = spawn2(command, args, {
-        detached,
-        stdio: "ignore",
-        env: getMsysDisabledEnv()
-      });
-      const handleError = (error) => {
-        child.off("spawn", handleSpawn);
-        reject(error);
-      };
-      const handleSpawn = () => {
-        child.off("error", handleError);
-        child.unref();
-        resolve4();
-      };
-      child.once("error", handleError);
-      child.once("spawn", handleSpawn);
-    });
-  }
-};
-
 // src/infrastructure/terminalTheme.ts
 import { createInterface } from "readline";
 var parseOsc11Response = (response) => {
@@ -845,9 +776,9 @@ var MacUnityHubProjectsReader = class {
 
 // src/infrastructure/unityhub.win.ts
 import { readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { basename as basename4, join as join6 } from "path";
-var HUB_DIR = join6(process.env.APPDATA ?? "", "UnityHub");
-var HUB_PROJECTS_PATH2 = join6(HUB_DIR, "projects-v1.json");
+import { basename as basename4, join as join4 } from "path";
+var HUB_DIR = join4(process.env.APPDATA ?? "", "UnityHub");
+var HUB_PROJECTS_PATH2 = join4(HUB_DIR, "projects-v1.json");
 var schemaVersion2 = "v1";
 var toUnityProject2 = (entry) => {
   const safePath = entry.path;
@@ -981,7 +912,7 @@ var WinUnityHubProjectsReader = class {
     return newFavorite;
   }
   async readCliArgs(projectPath) {
-    const infoPath = join6(HUB_DIR, "projectsInfo.json");
+    const infoPath = join4(HUB_DIR, "projectsInfo.json");
     let content;
     try {
       content = await readFile3(infoPath, "utf8");
@@ -1008,9 +939,9 @@ var WinUnityHubProjectsReader = class {
 
 // src/infrastructure/unityLock.ts
 import { execFile as execFile3 } from "child_process";
-import { constants as constants5 } from "fs";
-import { access as access5, rm } from "fs/promises";
-import { join as join7 } from "path";
+import { constants as constants3 } from "fs";
+import { access as access3, rm } from "fs/promises";
+import { join as join5 } from "path";
 import { promisify as promisify3 } from "util";
 var execFileAsync3 = promisify3(execFile3);
 var buildBringToFrontScript = (pid) => {
@@ -1018,7 +949,7 @@ var buildBringToFrontScript = (pid) => {
 };
 var pathExists = async (target) => {
   try {
-    await access5(target, constants5.F_OK);
+    await access3(target, constants3.F_OK);
     return true;
   } catch {
     return false;
@@ -1038,7 +969,7 @@ var UnityLockChecker = class {
       await this.bringUnityToFront(activeProcess.pid);
       return "skip";
     }
-    const lockfilePath = join7(projectPath, "Temp", "UnityLockfile");
+    const lockfilePath = join5(projectPath, "Temp", "UnityLockfile");
     const hasLockfile = await pathExists(lockfilePath);
     if (!hasLockfile) {
       return "allow";
@@ -1076,7 +1007,7 @@ var UnityLockChecker = class {
 };
 var UnityLockStatusReader = class {
   async isLocked(projectPath) {
-    const lockfilePath = join7(projectPath, "Temp", "UnityLockfile");
+    const lockfilePath = join5(projectPath, "Temp", "UnityLockfile");
     return await pathExists(lockfilePath);
   }
 };
@@ -1443,11 +1374,11 @@ var WinUnityProcessTerminator = class {
 
 // src/infrastructure/unityTemp.ts
 import { rm as rm2 } from "fs/promises";
-import { join as join8 } from "path";
+import { join as join6 } from "path";
 var TEMP_DIRECTORY_NAME = "Temp";
 var UnityTempDirectoryCleaner = class {
   async clean(projectPath) {
-    const tempDirectoryPath = join8(projectPath, TEMP_DIRECTORY_NAME);
+    const tempDirectoryPath = join6(projectPath, TEMP_DIRECTORY_NAME);
     try {
       await rm2(tempDirectoryPath, {
         recursive: true,
@@ -2762,7 +2693,7 @@ var SHELL_INIT_MARKER_START = "# >>> unity-hub-cli >>>";
 var SHELL_INIT_MARKER_END = "# <<< unity-hub-cli <<<";
 var getVersion = () => {
   const currentDir = dirname2(fileURLToPath(import.meta.url));
-  const packageJsonPath = join9(currentDir, "..", "package.json");
+  const packageJsonPath = join7(currentDir, "..", "package.json");
   const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
   return packageJson.version;
 };
@@ -2770,18 +2701,18 @@ var getShellConfigPath = () => {
   const shell = process3.env["SHELL"] ?? "";
   const home = homedir();
   if (shell.includes("zsh")) {
-    return join9(home, ".zshrc");
+    return join7(home, ".zshrc");
   }
   if (shell.includes("bash")) {
-    const bashrcPath = join9(home, ".bashrc");
-    const profilePath = join9(home, ".bash_profile");
+    const bashrcPath = join7(home, ".bashrc");
+    const profilePath = join7(home, ".bash_profile");
     return existsSync3(bashrcPath) ? bashrcPath : profilePath;
   }
   if (shell.includes("fish")) {
-    return join9(home, ".config", "fish", "config.fish");
+    return join7(home, ".config", "fish", "config.fish");
   }
   if (process3.platform === "win32") {
-    return join9(home, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1");
+    return join7(home, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1");
   }
   return void 0;
 };
@@ -3162,17 +3093,9 @@ var bootstrap = async () => {
     lockStatusReader,
     unityProcessReader
   );
-  const editorPathResolver = isWindows ? new WinEditorPathResolver() : new MacEditorPathResolver();
-  const processLauncher = new NodeProcessLauncher();
   const lockChecker = new UnityLockChecker(unityProcessReader, unityTempDirectoryCleaner);
   const unityProcessTerminator = isWindows ? new WinUnityProcessTerminator() : new MacUnityProcessTerminator();
-  const launchProjectUseCase = new LaunchProjectUseCase(
-    editorPathResolver,
-    processLauncher,
-    unityHubReader,
-    unityHubReader,
-    lockChecker
-  );
+  const launchProjectUseCase = new LaunchProjectUseCase(lockChecker);
   const terminateProjectUseCase = new TerminateProjectUseCase(
     unityProcessReader,
     unityProcessTerminator,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {
@@ -38,9 +38,10 @@
   ],
   "dependencies": {
     "chalk": "5.6.2",
-    "clipboardy": "5.0.1",
-    "ink": "6.5.1",
-    "react": "19.2.1"
+    "clipboardy": "5.2.0",
+    "ink": "6.6.0",
+    "launch-unity": "0.13.0",
+    "react": "19.2.4"
   },
   "engines": {
     "node": ">=18"
@@ -55,20 +56,20 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
-    "@lavamoat/allow-scripts": "3.4.1",
-    "@types/node": "24.10.1",
-    "@types/react": "19.2.7",
-    "@typescript-eslint/eslint-plugin": "8.48.1",
-    "@typescript-eslint/parser": "8.48.1",
-    "eslint": "9.39.1",
+    "@lavamoat/allow-scripts": "3.4.2",
+    "@types/node": "25.2.0",
+    "@types/react": "19.2.10",
+    "@typescript-eslint/eslint-plugin": "8.54.0",
+    "@typescript-eslint/parser": "8.54.0",
+    "eslint": "9.39.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import": "2.32.0",
-    "prettier": "3.7.4",
+    "prettier": "3.8.1",
     "tsup": "8.5.1",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.48.1",
-    "vitest": "4.0.15"
+    "vitest": "4.0.18"
   }
 }